From 805e735da55dbb3bac2ac7897755f9e163965a22 Mon Sep 17 00:00:00 2001 From: marcsello Date: Sun, 29 Mar 2020 19:30:59 +0200 Subject: [PATCH] Other fixes --- app.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index cfa109c..7304cf4 100644 --- a/app.py +++ b/app.py @@ -16,15 +16,15 @@ __copyright__ = "Copyright 2020, GoldenPogácsa Team" __module_name__ = "app" __version__text__ = "1" - sentry_sdk.init("https://0a106e104e114bc9a3fa47f9cb0db2f4@sentry.kmlabz.com/10") + def main(): r = redis.Redis(host='localhost', port=6379, db=0) ip_list = os.environ['INITIAL_SERVERS'].split(',') - ip_list_redis = json.loads(r.get('consumer_list').decode('utf-8')) + consumer_list_redis = json.loads((r.get('consumer_list') or b'{}').decode('utf-8')) temp_dict = {} @@ -37,15 +37,16 @@ def main(): if response.status_code == 200: temp_dict[response.json()['uuid']] = {'ip': ip} - ip_list_redis.update(temp_dict) + consumer_list_redis.update(temp_dict) - r.set('consumer_list', json.dumps(ip_list_redis).encode('utf-8')) + r.set('consumer_list', json.dumps(consumer_list_redis).encode('utf-8')) while True: - ip_list_redis = json.loads(r.get('consumer_list').decode('utf-8')) + consumer_list_redis = json.loads((r.get('consumer_list') or b'{}').decode('utf-8')) - for ip in ip_list_redis: + for uuid, info in consumer_list_redis.items(): + ip = info['ip'] try: response = requests.post(f"http://{ip}/sync", json={'uuid': os.environ['LOCAL_UUID']}) except requests.exceptions.ConnectionError: @@ -54,8 +55,8 @@ def main(): if response.status_code == 200: temp_dict[response.json()['uuid']] = {'ip': ip} - ip_list_redis.update(temp_dict) - r.set('consumer_list', json.dumps(ip_list_redis).encode('utf-8')) + consumer_list_redis.update(temp_dict) + r.set('consumer_list', json.dumps(consumer_list_redis).encode('utf-8')) time.sleep(30)