master/main.py

@@ -174,14 +174,10 @@ def list_workers():
         resp=requests.get("http://"+worker.split(':')[1].strip('\n') + ":5000/status",timeout=2)
         if (resp.status_code != 200):
             online=False
-            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[1].strip('\n'), 'online': online, 'sites': 0, 'status': 'offline'})
+            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[1].strip('\n'), 'online': online, 'sites': 0, 'ready': 0})
             continue
         sites = resp.json()['num_sites']
-        availability = resp.json()['availability']
-        if availability == True:
-            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[1].strip('\n'), 'online': online, 'sites': sites, 'status': 'ready'})
-        else:
-            worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[1].strip('\n'), 'online': online, 'sites': sites, 'status': 'full'})
+        worker_list.append({'worker': worker.split(':')[0],'ip': worker.split(':')[1].strip('\n'), 'online': online, 'sites': sites, 'ready': 1})
     
     if len(worker_list) == 0:
         return jsonify({'error': 'No workers available', 'success': 'false'})

worker/main.py

@@ -67,11 +67,16 @@ def ping():
     return 'pong'
 
 def get_sites_count():
-    # Get number of files in nginx/sites
-    dir = os.listdir('/etc/nginx/sites-available')
-    num_Sites = len(dir) - 1    
+    # If file doesn't exist, create it
+    try:
+        sites_file = open('sites.txt', 'r')
+    except FileNotFoundError:
+        sites_file = open('sites.txt', 'w')
+        sites_file.close()
+        sites_file = open('sites.txt', 'r')
+    print(sites_file.readlines())
     # Return number of lines in file
-    return num_Sites
+    return len(sites_file.readlines())
 
 def site_exists(domain):
     # If file doesn't exist, create it