lobo/wttr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

_touch_empty_file (for debug purposes)

Browse source
This commit is contained in:
Igor Chubin 2019-08-25 20:37:24 +02:00
parent c465dfe08f
commit 3b00e2445b
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bin/proxy.py
View file

@ -76,6 +76,14 @@ def _load_content_and_headers(path, query):
except IOError: except IOError:
return None, None return None, None
def _touch_empty_file(path, query, content, headers):
timestamp = time.strftime("%Y%m%d%H", time.localtime())
cache_file = os.path.join(PROXY_CACHEDIR + ".empty", timestamp, path, query)
cache_dir = os.path.dirname(cache_file)
if not os.path.exists(cache_dir):
os.makedirs(cache_dir)
open(cache_file, 'w').write("")
def _save_content_and_headers(path, query, content, headers): def _save_content_and_headers(path, query, content, headers):
timestamp = time.strftime("%Y%m%d%H", time.localtime()) timestamp = time.strftime("%Y%m%d%H", time.localtime())
cache_file = os.path.join(PROXY_CACHEDIR, timestamp, path, query) cache_file = os.path.join(PROXY_CACHEDIR, timestamp, path, query)
@ -172,6 +180,7 @@ def proxy(path):
lang = request.args.get('lang', 'en') lang = request.args.get('lang', 'en')
query_string = request.query_string query_string = request.query_string
query_string = query_string.replace('sr-lat', 'sr') query_string = query_string.replace('sr-lat', 'sr')
query_string = query_string.replace('lang=None', 'lang=en')
content, headers = _load_content_and_headers(path, query_string) content, headers = _load_content_and_headers(path, query_string)
if content is None: if content is None:
@ -180,23 +189,29 @@ def proxy(path):
print(url) print(url)
attempts = 5 attempts = 5
response = None
while attempts: while attempts:
response = requests.get(url, timeout=10) response = requests.get(url, timeout=2)
try: try:
json.loads(response.content) json.loads(response.content)
break break
except ValueError: except ValueError:
attempts -= 1 attempts -= 1
_touch_empty_file(path, query_string, content, headers)
if response:
headers = {} headers = {}
headers['Content-Type'] = response.headers['content-type'] headers['Content-Type'] = response.headers['content-type']
content = add_translations(response.content, lang) content = add_translations(response.content, lang)
_save_content_and_headers(path, query_string, content, headers) _save_content_and_headers(path, query_string, content, headers)
else:
content = "{}"
return content, 200, headers return content, 200, headers
if __name__ == "__main__": if __name__ == "__main__":
#app.run(host='0.0.0.0', port=5001, debug=False) #app.run(host='0.0.0.0', port=5001, debug=False)
#app.debug = True #app.debug = True
SERVER = WSGIServer((PROXY_HOST, PROXY_PORT), APP) bind_addr = "0.0.0.0"
SERVER = WSGIServer((bind_addr, PROXY_PORT), APP)
SERVER.serve_forever() SERVER.serve_forever()