update webinterface startup bug

xirixiz · Apr 20, 2024 · 5a48d14 · 5a48d14
1 parent c0d810a
commit 5a48d14
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -24,7 +24,7 @@ concurrency:
 env:
   DOCKER_TARGET_REPO: xirixiz/dsmr-reader-docker
   DOCKERFILE: Dockerfile
-  DOCKER_TARGET_RELEASE: 2024.04.02
+  DOCKER_TARGET_RELEASE: 2024.04.03
 
 jobs:
   ################################################

diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend/run
@@ -4,7 +4,7 @@
 if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
     echo "Starting DSMR Reader - backend..."
     cd /app || exit
-    nice -n 10 s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_backend
+    s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_backend
 else
     sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/dependencies
@@ -1,2 +1 @@
-init-docker-entrypoint
-svc-nginx
+init-docker-entrypoint
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/run
@@ -4,7 +4,7 @@
 if [[ "${DSMRREADER_OPERATION_MODE}" = standalone ]]; then
     echo "Starting DSMR Reader - datalogger..."
     cd /app || exit
-    nice -n 5 s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_datalogger
+    s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_datalogger
 else
     sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/dependencies
@@ -1,2 +1 @@
-init-docker-entrypoint
-svc-nginx
+init-docker-entrypoint
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/run
@@ -4,7 +4,7 @@
 if [[ "${DSMRREADER_OPERATION_MODE}" = api_client ]]; then
     echo "Starting DSMR Reader - remote datalogger (api_client)..."
     cd /app || exit
-    nice -n 5 s6-setuidgid app /usr/local/bin/python3 -u /app/dsmr_datalogger_api_client.py
+    s6-setuidgid app /usr/local/bin/python3 -u /app/dsmr_datalogger_api_client.py
 else
     sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/dependencies
@@ -1 +1,2 @@
-init-docker-entrypoint
+init-docker-entrypoint
+svc-dsmr-backend-log
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/run
@@ -4,7 +4,7 @@
 if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
     echo "Starting DSMR Reader - webinterface..."
     cd /app || exit
-    nice -n 15 s6-setuidgid app /usr/local/bin/gunicorn dsmrreader.wsgi --timeout 60 --max-requests 500 --bind unix:/tmp/gunicorn--dsmr_webinterface.socket
+    s6-setuidgid app /usr/local/bin/gunicorn dsmrreader.wsgi --timeout 60 --max-requests 500 --bind unix:/tmp/gunicorn--dsmr_webinterface.socket
 else
     sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies
@@ -1 +1,2 @@
-init-docker-entrypoint
+init-docker-entrypoint
+svc-dsmr-webinterface