Changeset - 5e43626fccc0
[Not reviewed]
Merge default
0 3 0
Dennis Fink - 9 years ago 2016-05-16 21:13:29
dennis.fink@c3l.lu
Merged dev
3 files changed with 12 insertions and 9 deletions:
0 comments (0 inline, 0 general)
ennstatus/api/views.py
Show inline comments
 
@@ -115,15 +115,16 @@ def update():
 
        current_app.logger.warning(' '.join([str(e), str(data)]))
 
        return str(e), 409, {'Content-Type': 'text/plain'}
 

	
 
    try:
 
        server.update_weights()
 
    except NotImplementedError:
 
        pass
 
    if current_app.config['ENNSTATUS_ENABLE_ONIONOO']:
 
        try:
 
            server.update_weights()
 
        except NotImplementedError:
 
            pass
 

	
 
    try:
 
        server.update_flags()
 
    except NotImplementedError:
 
        pass
 
        try:
 
            server.update_flags()
 
        except NotImplementedError:
 
            pass
 

	
 
    try:
 
        server.save()
ennstatus/config.py
Show inline comments
 
@@ -36,3 +36,5 @@ def init_app(app):
 
    config.setdefault('ENNSTATUS_MOMENTJS_FORMAT', 'DD MMMM YYYY HH:mm:ss')
 

	
 
    config.setdefault('ENNSTATUS_STRFTIME_FORMAT', '%d %B %Y %H:%M:%S')
 

	
 
    config.setdefault('ENNSTATUS_ENABLE_ONIONOO', False)
setup.py
Show inline comments
 
@@ -11,7 +11,7 @@ def _get_requirements():
 

	
 

	
 
setup(name='Ennstatus',
 
      version='5.4.7',
 
      version='5.5.0',
 
      description=('Ennstatus provides the user with vital information about '
 
                   'the status of the organizations Tor servers.'),
 
      author='Frënn vun der Ënn',
0 comments (0 inline, 0 general)