From c49ae315f8fdbe4bc2735b9afdbfb628d076382b Mon Sep 17 00:00:00 2001
From: Bram van Dartel <root@rootrulez.com>
Date: Tue, 23 Apr 2024 09:07:49 +0200
Subject: [PATCH] remove nice command and increase gunicorn timeout

---
 .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/run        | 2 +-
 rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-remote-datalogger/run | 2 +-
 rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/run      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 9a42117..e12c4d5 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.03
+  DOCKER_TARGET_RELEASE: 2024.04.04
 
 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/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/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/run b/rootfs/etc/s6-overlay/s6-rc.d/svc-dsmr-webinterface/run
index cb9096b..9b030df 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 120 --max-requests 1000 --bind unix:/tmp/gunicorn--dsmr_webinterface.socket
 else
     sleep infinity
 fi