restructure logging, bugfix and fix datalogger service

Dockerfile

@@ -33,10 +33,8 @@ 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
-  # S6_BEHAVIOUR_IF_STAGE2_FAILS=1
+  PIP_NO_CACHE_DIR=1 \
+  S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
 ENV DJANGO_SECRET_KEY=dsmrreader \
   DJANGO_DATABASE_ENGINE=django.db.backends.postgresql \

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-webinterface-log/dependencies

@@ -1 +1 @@
-svc-dsmr-datalogger
+svc-dsmr-webinterface

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

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