Development (#360)

* restructured logging to stdout
* update datalogger bug (oneshot instead of longrun)

---------

Co-authored-by: Bram van Dartel <[email protected]>
Co-authored-by: Bram van Dartel <[email protected]>

.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.01
+  DOCKER_TARGET_RELEASE: 2024.04.02
 
 jobs:
   ################################################

Dockerfile

@@ -34,7 +34,6 @@ ENV QEMU_ARCH=${QEMU_ARCH:-x86_64} \
   DSMR_VERSION=${DSMR_VERSION} \
   DOCKER_TARGET_RELEASE=${DOCKER_TARGET_RELEASE} \
   PIP_NO_CACHE_DIR=1 \
-  S6_SERVICES_GRACETIME=30000 \
   S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
 ENV DJANGO_SECRET_KEY=dsmrreader \

rootfs/etc/s6-overlay/s6-rc.d/init-docker-entrypoint/run

@@ -187,11 +187,11 @@ function _check_db_availability() {
     fi
     if [[ -n "${DJANGO_DATABASE_ENGINE}" ]]; then
         _info "Verifying database connectivity to host: ${DJANGO_DATABASE_HOST} with port: ${DJANGO_DATABASE_PORT}..."
-        for i in {1..30}; do
-            if ! nc -z "${DJANGO_DATABASE_HOST}" "${DJANGO_DATABASE_PORT}"; then
+        for i in {1..10}; do
+            if ! nc -z "${DJANGO_DATABASE_HOST}" "${DJANGO_DATABASE_PORT}" > /dev/null 2>&1; then
                 sleep 1
-                printf "\\rTesting database connectivity: %s second(s) of 30 seconds..." "$i"
-                if [[ $i == 30 ]]; then
+                printf "\\rTesting database connectivity: %s second(s) of 10 seconds..." "$i"
+                if [[ $i == 10 ]]; then
                     _error "Database connectivity couldn't be verified! Please verify your settings. Exiting..."
                     exit 1
                 fi

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend-log/dependencies

@@ -0,0 +1 @@
+svc-dsmr-backend

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend-log/run

@@ -0,0 +1,4 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+s6-log -bp -- /var/log/dsmr_backend

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend-log/type

@@ -0,0 +1 @@
+longrun

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-backend-log/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-dsmr-backend-log/run

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
-    exec s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_backend
+    nice -n 10 s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_backend
 else
     sleep infinity
-fi
+fi

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger-log/dependencies

@@ -0,0 +1 @@
+svc-dsmr-datalogger

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger-log/run

@@ -0,0 +1,4 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+s6-log -bp -- /var/log/dsmr_datalogger

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger-log/type

@@ -0,0 +1 @@
+longrun

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger-log/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger-log/run

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
-    exec s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_datalogger
+    nice -n 5 s6-setuidgid app /usr/local/bin/python3 -u /app/manage.py dsmr_datalogger
 else
     sleep infinity
-fi
+fi

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-datalogger/type

@@ -1 +1 @@
-oneshot
+longrun

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
-    exec s6-setuidgid app /usr/local/bin/python3 -u /app/dsmr_datalogger_api_client.py
+    nice -n 5 s6-setuidgid app /usr/local/bin/python3 -u /app/dsmr_datalogger_api_client.py
 else
     sleep infinity
-fi
+fi

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface-log/dependencies

@@ -0,0 +1 @@
+svc-dsmr-webinterface

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface-log/run

@@ -0,0 +1,4 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+s6-log -bp -- /var/log/dsmr_webinterface

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface-log/type

@@ -0,0 +1 @@
+longrun

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface-log/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface-log/run

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
-    exec s6-setuidgid app /usr/local/bin/gunicorn dsmrreader.wsgi --timeout 60 --max-requests 500 --bind unix:/tmp/gunicorn--dsmr_webinterface.socket
+    nice -n 15 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

rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/type

@@ -1 +1 @@
-longrun
+longrun

rootfs/etc/s6-overlay/s6-rc.d/svc-nginx/run

@@ -4,7 +4,8 @@
 if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
     echo "Starting DSMR Reader - nginx..."
     cd /app || exit
-    exec /usr/sbin/nginx -g "daemon off;"
+    # s6-setuidgid app
+    /usr/sbin/nginx -g 'daemon off;'
 else
     sleep infinity
 fi