merge: #195 from dev

NaturalHistoryMuseum · Jul 29, 2024 · aae0d03 · aae0d03
2 parents 5234aa7 + 21ca552
commit aae0d03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ansible/roles/phenome-10k/templates/gunicorn.service.j2 b/ansible/roles/phenome-10k/templates/gunicorn.service.j2
@@ -3,7 +3,7 @@ Description=phenome10k service
 
 [Service]
 Type=simple
-ExecStart={{ gunicorn_binary }} --error-logfile /var/log/phenome10k/error.log --access-logfile /var/log/phenome10k/access.log -b 0.0.0.0:{{ gunicorn_port }} -w 4 api.wsgi:app
+ExecStart={{ gunicorn_binary }} --error-logfile /var/log/phenome10k/error.log --access-logfile /var/log/phenome10k/access.log -b 0.0.0.0:{{ gunicorn_port }} -w 4 --threads 8 --timeout 120 api.wsgi:app
 Restart=on-abort
 WorkingDirectory={{ p10k_src_dir }}
 User={{ p10k_linux_user }}

diff --git a/api/phenome10k/__init__.py b/api/phenome10k/__init__.py
@@ -25,7 +25,7 @@ def init(return_celery=False):
 
     log_file = Path(Config.LOG_FILE)
     log_file.parent.mkdir(exist_ok=True, parents=True)
-    log_level = 'DEBUG' if app.debug else 'WARNING'
+    log_level = 'DEBUG' if app.debug else Config.LOG_LEVEL
     # this adds a log file without disabling the default flask console log
     dictConfig(
         {

diff --git a/api/phenome10k/config.py b/api/phenome10k/config.py
@@ -26,6 +26,7 @@ class Config(object):
     MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
     ADMIN_EMAIL = os.environ.get('ADMIN_EMAIL') or '[email protected]'
     LOG_FILE = os.environ.get('LOG_FILE') or 'logs/phenome10k.log'
+    LOG_LEVEL = os.environ.get('LOG_LEVEL', 'WARNING')
     SERVER_NAME = os.environ.get('SERVER_NAME') or None
     UPLOAD_DIRECTORY = os.environ.get('UPLOAD_DIRECTORY') or os.path.abspath('uploads')
     MODEL_DIRECTORY = os.environ.get('MODEL_DIRECTORY') or os.path.abspath(