Merge pull request #324 from EBI-Metagenomics/develop

v2.4.27

.gitignore

@@ -25,3 +25,8 @@ fixtures/*.sig
 
 .coverage
 /build/
+
+loglockdir
+logs
+
+secret.key

config/local-lite.yml

@@ -16,14 +16,18 @@ emg:
     - 'django.contrib.auth.backends.ModelBackend'
     - 'emgapi.backends.EMGBackend'
 
-  cors_origin_allow_all: true
   debug: true
   results_dir: '/opt/emgapi/results'
   results_production_dir: '/opt/emgapi/results'
   static_root: '/opt/emgapi/staticfiles'
   emg_backend_auth: 'https://wwwdev.ebi.ac.uk/ena/dev/submit/webin/auth/login'
   secure_cookies: false
 
+  log_dir: '/opt/emgapi/logs'
+  log_lock_dir: '/opt/emgapi/loglockdir'
+
+  secret_key: '/opt/emgapi'
+
   mongodb:
     db: emg
     host: mongodb

emgcli/__init__.py

@@ -1 +1 @@
-__version__: str = "2.4.26"
+__version__: str = "2.4.27"

emgcli/settings.py

@@ -62,6 +62,10 @@
 if not os.path.exists(LOGDIR):
     os.makedirs(LOGDIR)
 
+LOG_LOCK_DIR = EMG_CONF["emg"].get("log_lock_dir", LOGDIR)
+if not os.path.exists(LOG_LOCK_DIR):
+    os.makedirs(LOG_LOCK_DIR)
+
 LOGFILE = EMG_CONF["emg"].get("log_file", "emg.log")
 
 LOGGING_CLASS = 'concurrent_log_handler.ConcurrentRotatingFileHandler'
@@ -90,6 +94,7 @@
             'level': 'DEBUG',
             'class': LOGGING_CLASS,
             'filename': os.path.join(LOGDIR, LOGFILE).replace('\\', '/'),
+            'lock_file_directory': os.path.join(LOG_LOCK_DIR).replace('\\', '/'),
             'maxBytes': 1024 * 1024 * 10,
             'backupCount': 50,
             'formatter': 'default',

pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "yamjam==0.1.7",
     "PyYAML==6.0",
     # log handler
-    "concurrent-log-handler~=0.9.22",
+    "concurrent-log-handler~=0.9.24",
     # django
     "Django==3.2.18",
     "djangorestframework==3.12",
@@ -116,7 +116,7 @@ max-line-length = 119
 """
 
 [tool.bumpversion]
-current_version = "2.4.26"
+current_version = "2.4.27"
 
 [[tool.bumpversion.files]]
 filename = "emgcli/__init__.py"