restructure logging, bugfix and fix datalogger service

Dockerfile

@@ -33,9 +33,10 @@ ENV PS1="$(whoami)@dsmr_reader_docker:$(pwd)\\$ " \
 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
+  PIP_NO_CACHE_DIR=1
+  # S6_SERVICES_GRACETIME=30000 \
+  # S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
+  # S6_BEHAVIOUR_IF_STAGE2_FAILS=1
 
 ENV DJANGO_SECRET_KEY=dsmrreader \
   DJANGO_DATABASE_ENGINE=django.db.backends.postgresql \

rootfs/etc/s6-overlay/s6-rc.d/sig-handler/run

@@ -0,0 +1,10 @@
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/sig-handler/run
+# shellcheck shell=bash
+
+# Trap SIGINT and gracefully shutdown
+foreground {
+  s6-trap-init SIGINT
+}
+importas -u SIGINT SIGINT
+s6-svscanctl -t /var/run/s6/services

rootfs/etc/s6-overlay/s6-rc.d/sig-handler/type

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

rootfs/etc/s6-overlay/s6-rc.d/sig-handler/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/sig-handler/run

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,5 @@
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_backend-log/run
+# 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

@@ -1,10 +1,15 @@
-#!/command/with-contenv bash
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_backend/run
 # shellcheck shell=bash
 
+with-contenv
+
 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 /dsmr/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,5 @@
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_datalogger-log/run
+# 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

@@ -1,10 +1,15 @@
-#!/command/with-contenv bash
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_datalogger/run
 # shellcheck shell=bash
 
+with-contenv
+
 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 /dsmr/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

@@ -1,10 +1,15 @@
-#!/command/with-contenv bash
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_client_datalogger/run
 # shellcheck shell=bash
 
+with-contenv
+
 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 /dsmr/dsmr_datalogger/scripts/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-datalogger

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

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_webinterface-log/run
+# 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

@@ -1,10 +1,15 @@
-#!/command/with-contenv bash
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/dsmr_webinterface/run
 # shellcheck shell=bash
 
+with-contenv
+
 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-nginx/run

@@ -1,10 +1,14 @@
-#!/command/with-contenv bash
+#!/bin/execlineb -P
+# /etc/s6-overlay/s6-rc.d/nginx/run
 # shellcheck shell=bash
 
+with-contenv
+
 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