From 787413272569ced12501f502014ce52123d5b87f Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 26 Aug 2022 13:00:35 -0400 Subject: [PATCH] switch to hybrid --- .../dependencies.d/init-services | 0 .../s6-rc.d/svc-mod-universal-stdout-logs/run | 10 ++++++++++ .../s6-rc.d/svc-mod-universal-stdout-logs/type | 1 + .../user/contents.d/svc-mod-universal-stdout-logs | 0 root/etc/services.d/stdout-logs/run | 0 5 files changed, 11 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-stdout-logs mode change 100644 => 100755 root/etc/services.d/stdout-logs/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run new file mode 100755 index 0000000..96b4ad3 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/run @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash + +if [ -n "${LOGS_TO_STDOUT}" ]; then + TAIL_LOGS=$(echo "$LOGS_TO_STDOUT" | sed 's#|# #g') + echo "Executing: tail -F $TAIL_LOGS" + tail -F $TAIL_LOGS +else + echo "**** Env var LOGS_TO_STDOUT is not set, sleeping ****" + sleep infinity +fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-stdout-logs/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-stdout-logs b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-mod-universal-stdout-logs new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/stdout-logs/run b/root/etc/services.d/stdout-logs/run old mode 100644 new mode 100755