Development (#361)

* bugfix websocket timeout

.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:
   ################################################

.gitignore

@@ -1,6 +1,7 @@
 # Windows image file caches
 Thumbs.db
 ehthumbs.db
+dsmr_dev
 
 # Folder config file
 Desktop.ini
@@ -45,4 +46,4 @@ Temporary Items
 
 # Ansible
 *.retry
-ansible.log
+ansible.log

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

@@ -1,2 +1 @@
-init-docker-entrypoint
-svc-nginx
+init-docker-entrypoint

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

@@ -1,2 +1 @@
-init-docker-entrypoint
-svc-nginx
+init-docker-entrypoint

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

@@ -1 +1,2 @@
-init-docker-entrypoint
+init-docker-entrypoint
+svc-dsmr-backend-log

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

@@ -1 +1,2 @@
-init-docker-entrypoint
+init-docker-entrypoint
+svc-dsmr-webinterface

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

@@ -2,10 +2,21 @@
 # shellcheck shell=bash
 
 if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
-    echo "Starting DSMR Reader - nginx..."
-    cd /app || exit
-    # s6-setuidgid app
-    /usr/sbin/nginx -g 'daemon off;'
+    for i in {1..10}; do
+        if [ -e "/tmp/gunicorn--dsmr_webinterface.socket" ]; then
+            echo "Starting DSMR Reader - nginx..."
+            sleep 2
+            cd /app || exit
+            /usr/sbin/nginx -g 'daemon off;'
+        else
+            sleep 1
+            printf "\\rTesting webservice socket connectivity: %s second(s) of 10 seconds..." "$i"
+            if [[ $i == 10 ]]; then
+                echo "Webinterface socket couldn't be verified! Please verify the webinterface log files. Exiting..."
+                exit 1
+            fi
+        fi
+    done
 else
     sleep infinity
 fi