FVDE/ennstatus Changeset - 5f5d699c039c · Chaos Computer Club Lëtzebuerg Projects

Changeset - 5f5d699c039c

Parent rev.

Child rev.

[Not reviewed]

default

1 1 0

Dennis Fink - 11 years ago 2014-01-22 18:30:12
dennis.fink@c3l.lu

check servers is now included in ennstatus directly

2 files changed with 34 insertions and 56 deletions:

Scripts/check_servers.py

ennstatus/status/functions.py

0 comments (0 inline, 0 general)

Scripts/check_servers.py

➞

Show inline comments

deleted file

ennstatus/status/functions.py

➞

Show inline comments

@@ @@ -3,6 +3,7 @@ import os.path @@
 import json
 from collections import defaultdict
 from datetime import datetime
 def _load_single_server(name):
@@ @@ -14,13 +15,42 @@ def _load_single_server(name): @@
         return False
 def _check_server(data):
     date = datetime.strptime(data['last_updated'], '%d-%m-%Y %H:%M:%S')
     now = datetime.utcnow()
     delta = now - date
     print(data['server_name'])
     print(delta.seconds)
     if delta.seconds >= 3600:
         status = 'Offline'
     elif delta.seconds >= 1200:
         status = 'Unknown'
     else:
         status = None
     if status is not None:
         for key in ('server_status', 'tor_status'):
             data[key] = status
     filename = os.path.join('data', data['server_name']+'.json')
     with open(filename, mode='w', encoding='utf-8') as file_object:
         json.dump(data, file_object)
     return data
 def single_server(name):
     server = _load_single_server(name)
     if server:
         try:
             return json.loads(server)
             server = json.loads(server)
             server = _check_server(server)
             return server
         except ValueError:
             return False
     else:
@@ @@ -40,10 +70,12 @@ def all_servers(): @@
         for f in _get_json_files(root, files):
             with open(f) as fb:
                 try:
-                    yield json.load(fb)
+                    server = json.load(fb)
                 except ValueError:
                     fb.close()
                     continue
             server = _check_server(server)
             yield server
 def all_servers_by_type(type):

0 comments (0 inline, 0 general)