From 5a48d14d5c421a3754c5a4ae61391ac708614a32 Mon Sep 17 00:00:00 2001 From: Bram van Dartel Date: Sat, 20 Apr 2024 07:16:29 +0200 Subject: [PATCH] update webinterface startup bug --- .github/workflows/build_release.yml | 2 +- rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend/run | 2 +- rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/dependencies | 3 +-- rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/run | 2 +- .../s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/dependencies | 3 +-- rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/run | 2 +- .../etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/dependencies | 3 ++- rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/run | 2 +- rootfs/etc/s6-overlay/s6-rc.d/svc-nginx/dependencies | 3 ++- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 288f34c..9a42117 100644 --- 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 index b11c49b..cc1b22d 100755 --- 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 \ No newline at end of file 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 index aeb4dd8..6c2437a 100755 --- 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 \ No newline at end of file +init-docker-entrypoint \ No newline at end of file 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 index 6d4846f..56babba 100755 --- 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 \ No newline at end of file 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 index aeb4dd8..6c2437a 100755 --- 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 \ No newline at end of file +init-docker-entrypoint \ No newline at end of file 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 index 5f778b6..5a2a8d1 100755 --- 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 \ No newline at end of file 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 index 6c2437a..7db83ab 100755 --- 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 \ No newline at end of file +init-docker-entrypoint +svc-dsmr-backend-log \ No newline at end of file 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 index cb9096b..d6fbf55 100755 --- 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 index 6c2437a..7545eca 100755 --- 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 \ No newline at end of file +init-docker-entrypoint +svc-dsmr-webinterface \ No newline at end of file