frontend _id

Author: gferrate

frontend/app.py

@@ -25,6 +25,9 @@ def check_clients_ok():
         else:
             client['check_ok'] = True
 
+def get_id(host, port):
+    return 'client_{}_{}'.format(host, port)
+
 
 @app.route('/')
 def index():
@@ -57,7 +60,7 @@ def fake_data():
         client = random.choice(client_types)
         status = random.choice(statuses)
         check_ok = random.choice([True, False])
-        _id = 'client_{}'.format(port)
+        _id = 'client_127.0.0.1_{}'.format(port)
         data = {
             'client_type': client,
             '_id': _id,
@@ -82,14 +85,16 @@ def index_fe():
 def keep_alive():
     global global_state
     data = json.loads(request.data)
-    _id = data['_id']
+    host = request.remote_addr
+    port = data['port']
+    _id = get_id(host, port)
     if _id not in global_state['clients']:
         global_state['clients'][_id] = {
             'joined_at': datetime.now().strftime('%Y-%m-%d %H:%m'),
             'client_type': data['client_type'],
-            'port': data['port'],
+            'port': port,
             'check_ok': True,
-            'host': data['host'],
+            'host': host,
             'last_ping': datetime.now()
         }
     global_state['clients'][_id].update({'state': data['state']})
@@ -112,13 +117,13 @@ def get_state():
     global global_state
     host = request.remote_addr
     data = json.loads(request.data)
-    # TODO: Conform _id from real host
-    _id = data['_id']
+    port = data['port']
+    _id = get_id(host, port)
     if _id not in global_state['clients']:
         global_state['clients'][_id] = {
             'joined_at': datetime.now().strftime('%Y-%m-%d %H:%m'),
             'client_type': data['client_type'],
-            'port': data['port'],
+            'port': port,
             'check_ok': True,
             'host': host,
             'last_ping': datetime.now()