worker: use native celery worker in production mode

Parisson · Oct 13, 2020 · b3a726a · b3a726a
1 parent 915a305
commit b3a726a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/bin/worker.sh b/app/bin/worker.sh
@@ -3,5 +3,13 @@
 SCRIPT_DIR="$(dirname "$0")"
 source "$SCRIPT_DIR/app_base.sh"
 
-python3 manage.py timeside-celery-worker --loglevel $log_level --logfile $worker_log_file --uid $uid --gid $gid
+# fix celery log access
+mkdir -p '/var/log/celery/'
+chown -R $uid:$gid '/var/log/celery/'
+
+if [ $DEBUG = True ]; then
+    python3 manage.py timeside-celery-worker --loglevel $log_level --logfile $worker_log_file --uid $uid --gid $gid
+else
+    celery -A worker worker --loglevel=$loglevel --logfile=$worker_log_file --uid=$uid --gid=$gid
+fi
 
diff --git a/timeside/server/views.py b/timeside/server/views.py
@@ -501,8 +501,7 @@ def get(self, request, *args, **kwargs):
         if result.hdf5:
             container.from_hdf5(result.hdf5.path)
         else:
-
-        return HttpResponse(container.to_json(),
+            return HttpResponse(container.to_json(),
                             content_type='application/json')