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

Changeset - ca7125207eae

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Dennis Fink - 11 years ago 2014-09-15 18:47:13
dennis.fink@c3l.lu

Fixed mail sending when tor status is offline

1 file changed with 13 insertions and 6 deletions:

ennstatus/api/functions.py

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ PRIVATE_IP_REGEX = re.compile(PRIVATE_IP @@
 DATE_FORMAT = '%d-%m-%Y %H:%M:%S'
 gi4 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIP.dat', pygeoip.MEMORY_CACHE)
-mail_cache = {}
+mail_cache = dict()
 def check_bridge(key, server):
     if key not in server:
         raise ValueError('%s key not present!\n' % key)
@@ @@ -69,12 +69,19 @@ def check_json_format(server): @@
         elif PRIVATE_IP_REGEX.match(server['ip']) is not None:
             raise ValueError('ip is not accepted!\n')
     return True
 def _send_offline_mail(server_name, last_updated):
     subject = '[Ennstatus] %s Tor status went offline'
     _send_mail(server_name, last_updated, subject)
     mail_cache[server_name] = datetime.utcnow()
 def update_server(server, ip):
     server['last_updated'] = datetime.utcnow().strftime(DATE_FORMAT)
     server['server_status'] = 'Online'
     server['country'] = gi4.country_name_by_addr(ip)
     server_name = server['server_name']
@@ @@ -95,22 +102,22 @@ def update_server(server, ip): @@
         with open(filename, 'w', encoding='utf-8') as fb:
             json.dump(server, fb)
     except Exception as e:
         return e
     if server['tor_status'] == 'Offline':
         subject = '[Ennstatus] %s Tor status went offline'
         if server_name in mail_cache:
             send_date = mail_cache[server_name]
             now = datetime.utcnow()
             delta = now - send_date
-            if not delta.seconds >= 7200:
+            if delta.seconds <= 7200:
                 return server
         _send_mail(server_name, server['last_updated'], subject)
         mail_cache[server_name] = datetime.utcnow()
             else:
                 _send_offline_mail(server_name, server['last_updated'])
         else:
             _send_offline_mail(server_name, server['last_updated'])
     elif server_name in mail_cache:
         del mail_cache[server_name]
     return server

0 comments (0 inline, 0 general)