From 27d48a97467d1d7bae7d753d5e521fe973956838 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 16 Mar 2016 13:25:09 +0000 Subject: [PATCH 1/2] Pass application name in from start scripts - allows logger to log as correct application --- app/__init__.py | 12 +++++++----- run_celery.py | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 3b92f9265..79a62e78a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -27,10 +27,12 @@ encryption = Encryption() api_user = LocalProxy(lambda: _request_ctx_stack.top.api_user) -def create_app(): +def create_app(app_name=None): application = Flask(__name__) application.config.from_object(os.environ['NOTIFY_API_ENVIRONMENT']) + if app_name: + application.config['NOTIFY_APP_NAME'] = app_name init_app(application) db.init_app(application) @@ -92,10 +94,10 @@ def init_app(app): def email_safe(string): return "".join([ - character.lower() - if character.isalnum() or character == "." - else "" for character in re.sub("\s+", ".", string.strip()) - ]) + character.lower() + if character.isalnum() or character == "." + else "" for character in re.sub("\s+", ".", string.strip()) + ]) def create_uuid(): diff --git a/run_celery.py b/run_celery.py index 51ce92910..066735e63 100644 --- a/run_celery.py +++ b/run_celery.py @@ -1,5 +1,5 @@ #!/usr/bin/env python from app import notify_celery, create_app -application = create_app() +application = create_app('delivery') application.app_context().push() From 6ceddf0ebf1890ad6660d3a77ced9ce867253dc3 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 16 Mar 2016 14:08:25 +0000 Subject: [PATCH 2/2] pep8 fixed --- app/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 79a62e78a..28508cb1f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -94,10 +94,8 @@ def init_app(app): def email_safe(string): return "".join([ - character.lower() - if character.isalnum() or character == "." - else "" for character in re.sub("\s+", ".", string.strip()) - ]) + character.lower() if character.isalnum() or character == "." else "" for character in re.sub("\s+", ".", string.strip()) # noqa + ]) def create_uuid():