Commit fc21860a authored by Jonathan Schaeffer's avatar Jonathan Schaeffer

Merge branch 'dblock' into 'master'

Details

See merge request !3
parents 6f856c99 b090dc9d
Pipeline #47765 passed with stage
in 46 seconds
......@@ -20,12 +20,9 @@ else:
# Loglevel can be overrinden by LOGLEVEL env var :
if os.getenv('DEBUG') == 'true':
application.logger.setLevel(logging.DEBUG)
else:
application.logger.setLevel(logging.INFO)
application.config.from_object(Configurator)
def wsshash(login, password):
"""
Compute a hash suitable for the IRIS wss stack.
......@@ -228,7 +225,7 @@ def auth():
register_privileges(login, tokendict)
return "%s:%s"%(login, password)
else:
return Response('Internal server error. Contact resif-dc@univ-grenoble-alpes.fr', status=500)
return Response("Internal server error. Contact %s"%(application.config['SUPPORT_EMAIL']), status=500)
if __name__ == "__main__":
application.logger.info("Running in %s mode"%(application.config['ENVIRONMENT']))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment