Changeset - b990071f0a51
[Not reviewed]
default
0 1 0
Dennis Fink - 11 years ago 2014-08-12 21:42:24
dennis.fink@c3l.lu
Don't fail on wrong written json files
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
ennstatus/status/functions.py
Show inline comments
 
@@ -59,49 +59,49 @@ def _check_server(data):
 

	
 
    if status is not None:
 
        current_app.logger.error('%s is set to %s' % (server_name,
 
                                 status))
 

	
 
        if (current_status == 'Online' or current_status == 'Unknown') and \
 
           status == 'Offline':
 
            _send_mail(server_name, last_updated)
 

	
 
        for key in ('server_status', 'tor_status'):
 
            data[key] = status
 

	
 
        with open(filename, mode='w', encoding='utf-8') as file_object:
 
            json.dump(data, file_object)
 

	
 
    return data
 

	
 

	
 
def _load_single_server(filename):
 

	
 
    current_app.logger.info('Loading {}'.format(filename))
 
    try:
 
        with open(filename, encoding='utf-8') as f:
 
            server = json.load(f)
 
    except IOError:
 
    except (IOError, ValueError):
 
        return False
 

	
 
    server = _check_server(server)
 
    return server
 

	
 

	
 
def single_server(name):
 

	
 
    filename = ''.join(['data/', name, '.json'])
 
    return _load_single_server(filename)
 

	
 

	
 
def _get_json_files(root, files):
 

	
 
    for f in files:
 
        if f.endswith('.json'):
 
            yield os.path.join(root, f)
 

	
 

	
 
def all_servers():
 

	
 
    for root, _, files in os.walk('data'):
 
        for f in _get_json_files(root, files):
 
            yield _load_single_server(f)
0 comments (0 inline, 0 general)