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

Changeset - f5eac23abd09

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Dennis Fink - 11 years ago 2014-09-08 19:58:27
dennis.fink@c3l.lu

Send mail also if only tor_status is offline

2 files changed with 30 insertions and 5 deletions:

ennstatus/api/functions.py

ennstatus/status/functions.py

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -3,12 +3,15 @@ import re @@
 import json
 from datetime import datetime
 import pygeoip
 from ennstatus.status.functions import _send_mail
 FINGERPRINT_REGEX = re.compile(r'^[A-Z0-9]{40}$', re.I)
 IP_REGEX = (r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}'
             r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$')
 IP_REGEX = re.compile(IP_REGEX)
@@ @@ -19,12 +22,15 @@ 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 = {}
 def check_bridge(key, server):
     if key not in server:
         raise ValueError('%s key not present!\n' % key)
     else:
         if not isinstance(server[key], bool):
@@ @@ -68,26 +74,43 @@ def check_json_format(server): @@
 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']
     if server['server_type'] == 'Bridge':
         if 'ip' in server:
             del server['ip']
     else:
         for key in ('obfs', 'fteproxy', 'flashproxy', 'meek'):
             if key in server:
                 del server[key]
         if 'ip' not in server:
             server['ip'] = ip
     try:
-        filename = ''.join(['data/', server['server_name'].lower(), '.json'])
         filename = ''.join(['data/', server_name.lower(), '.json'])
         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:
                 return server
         _send_mail(server_name, server['last_updated'], subject)
         mail_cache[server_name] = datetime.utcnow()
     elif server_name in mail_cache:
         del mail_cache[server_name]
         return server
     except Exception as e:
         return e

ennstatus/status/functions.py

➞

Show inline comments

@@ @@ -9,17 +9,19 @@ from flask import current_app @@
 from flask_mail import Mail, Message
 mail = Mail()
 def _send_mail(server_name, last_updated):
+def _send_mail(server_name, last_updated, subject=None):
     current_app.logger.info('Try sending mail')
     try:
         msg = Message('[Ennstatus] %s went offline' % (server_name),
         if subject is None:
             subject = '[Ennstatus] %s went offline'
         msg = Message(subject % server_name,
                       sender='ennstatus@enn.lu')
         msg.add_recipient(current_app.config['SERVER_ADMINS'][server_name])
         msg.body = ('%s went offline. I received the last update at %s'
                     % (server_name, last_updated))
         mail.send(msg)
     except KeyError:

0 comments (0 inline, 0 general)