Changeset - ca7125207eae
[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:
0 comments (0 inline, 0 general)
ennstatus/api/functions.py
Show inline comments
 
@@ -16,25 +16,25 @@ IP_REGEX = (r'^(?:(?:25[0-5]|2[0-4][0-9]
 
IP_REGEX = re.compile(IP_REGEX)
 

	
 
PRIVATE_IP_REGEX = (r'(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)'
 
                    r'|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|'
 
                    r'255\.255\.255\.255')
 
PRIVATE_IP_REGEX = re.compile(PRIVATE_IP_REGEX)
 

	
 
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)
 
    else:
 
        if not isinstance(server[key], bool):
 
            error_message = ('%s has not the right type!'
 
                             ' Needs to be a boolean!\n') % key
 
            raise ValueError(error_message)
 

	
 
@@ -63,24 +63,31 @@ def check_json_format(server):
 
        for key in ('obfs', 'fteproxy', 'flashproxy', 'meek'):
 
            check_bridge(key, server)
 

	
 
    if 'ip' in server:
 
        if IP_REGEX.match(server['ip']) is None:
 
            raise ValueError('ip is not the right format!\n')
 
        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']
 

	
 
    if server['server_type'] == 'Bridge':
 
        if 'ip' in server:
 
            del server['ip']
 
    else:
 
        for key in ('obfs', 'fteproxy', 'flashproxy', 'meek'):
 
@@ -89,28 +96,28 @@ def update_server(server, ip):
 
        if 'ip' not in server:
 
            server['ip'] = ip
 

	
 
    try:
 
        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:
 
            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)