Commit 9b0e132e authored by Daniele Venzano's avatar Daniele Venzano

Merge branch 'master' of bf11.bigfoot.eurecom.fr:/srv/git/zoe into master-kpmg

Conflicts:
	requirements.txt
	zoe_api/entrypoint.py
parents deb7c9a4 31799d3f
......@@ -7,5 +7,4 @@ humanfriendly
psycopg2>=2.6.1
pyzmq>=15.2.0
typing
python-oauth2
python-consul
......@@ -32,7 +32,7 @@ from zoe_api.web.custom_request_handler import JinjaApp
log = logging.getLogger("zoe_api")
LOG_FORMAT = '%(asctime)-15s %(levelname)s %(threadName)s->%(name)s: %(message)s'
COOKIE_SECRET = "bZJc2sWbQLKos6GkHn/VB9oXwQt8S0R0kRvJ5/xJ89E="
def zoe_web_main() -> int:
"""
......@@ -57,13 +57,10 @@ def zoe_web_main() -> int:
app_settings = {
'static_path': os.path.join(os.path.dirname(__file__), "web", "static"),
'template_path': os.path.join(os.path.dirname(__file__), "web", "templates"),
'cookie_secret': COOKIE_SECRET,
'cookie_secret': config.get_conf().cookie_secret,
'debug': args.debug
}
# Remove the old FE entry point
app = Application(zoe_api.web.web_init(api_endpoint) + zoe_api.rest_api.api_init(api_endpoint), **app_settings)
#app = Application(zoe_api.rest_api.api_init(api_endpoint), **app_settings)
JinjaApp.init_app(app)
log.info("Starting HTTP server...")
......
......@@ -95,6 +95,8 @@ def load_configuration(test_conf=None):
argparser.add_argument('--backend', choices=['OldSwarm'], default='OldSwarm')
argparser.add_argument('--cookie-secret', help='secret used to encrypt cookies', default='changeme')
opts = argparser.parse_args()
if opts.debug:
argparser.print_values()
......
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