Skip to content

Commit 5c6dde6

Browse files
author
Bram van Dartel
committed
restructure logging, bugfix and fix datalogger service
1 parent c8ca7d5 commit 5c6dde6

File tree

8 files changed

+8
-26
lines changed
  • rootfs/etc/s6-overlay/s6-rc.d
    • svc-dsmr-backend
    • svc-dsmr-backend-log
    • svc-dsmr-datalogger
    • svc-dsmr-datalogger-log
    • svc-dsmr-remote-datalogger
    • svc-dsmr-webinterface
    • svc-dsmr-webinterface-log
    • svc-nginx

8 files changed

+8
-26
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_backend-log/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

54
s6-log -bp -- /var/log/dsmr_backend

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_backend/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

5-
with-contenv
6-
74
if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
85
echo "Starting DSMR Reader - backend..."
96
cd /app || exit
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_datalogger-log/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

54
s6-log -bp -- /var/log/dsmr_datalogger

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_datalogger/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

5-
with-contenv
6-
74
if [[ "${DSMRREADER_OPERATION_MODE}" = standalone ]]; then
85
echo "Starting DSMR Reader - datalogger..."
96
cd /app || exit

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_client_datalogger/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

5-
with-contenv
6-
74
if [[ "${DSMRREADER_OPERATION_MODE}" = api_client ]]; then
85
echo "Starting DSMR Reader - remote datalogger (api_client)..."
96
cd /app || exit
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_webinterface-log/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

54
s6-log -bp -- /var/log/dsmr_webinterface

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/dsmr_webinterface/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

5-
with-contenv
6-
74
if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
85
echo "Starting DSMR Reader - webinterface..."
96
cd /app || exit

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
#!/command/execlineb -P
2-
# /etc/s6-overlay/s6-rc.d/nginx/run
1+
#!/command/with-contenv bash
32
# shellcheck shell=bash
43

5-
with-contenv
6-
74
if [[ "${DSMRREADER_OPERATION_MODE}" = standalone || "${DSMRREADER_OPERATION_MODE}" = api_server ]]; then
85
echo "Starting DSMR Reader - nginx..."
96
cd /app || exit

0 commit comments

Comments
 (0)