From 993a0a5fe3fd044d0474f7befa81a81baf0a8743 Mon Sep 17 00:00:00 2001
From: David Schmitz <schmitz@lrz.de>
Date: Mon, 22 May 2023 07:23:18 +0000
Subject: [PATCH] runfod.sh: move systemd fod status to own script

---
 runfod.sh                     | 15 ++-------------
 systemd/fod-systemd-status.sh | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100755 systemd/fod-systemd-status.sh

diff --git a/runfod.sh b/runfod.sh
index 97da0c00..457c2e29 100755
--- a/runfod.sh
+++ b/runfod.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #!/bin/sh
 
 if [ -f "./runfod.conf" ]; then
@@ -24,19 +25,7 @@ fi
 
 if [ "$FOD_RUNMODE" = "via_systemd" ]; then
   echo "$0: using runmode via_systemd, nothing todo" 1>&2
-
-  SYSTEMD_COLORS=1 systemctl status "fod-gunicorn" | cat
-  echo
-
-  SYSTEMD_COLORS=1 systemctl status "fod-celeryd" | cat
-  echo
-
-  SYSTEMD_COLORS=1 systemctl status "redis" | cat
-  echo
-
-  SYSTEMD_COLORS=1 systemctl status "exabgpForFod" | cat
-  echo
-
+  exec ./systemd/fod-systemd-status.sh
 elif [ "$FOD_RUNMODE" = "via_supervisord" ]; then
   echo "$0: using runmode via_supervisord" 1>&2
   exec ./runfod-supervisord.sh "$@"
diff --git a/systemd/fod-systemd-status.sh b/systemd/fod-systemd-status.sh
new file mode 100755
index 00000000..d1d8b5c5
--- /dev/null
+++ b/systemd/fod-systemd-status.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if systemctl cat redis &>/dev/null; then
+  SYSTEMD_COLORS=1 systemctl status "redis" | cat 
+else
+  SYSTEMD_COLORS=1 systemctl status "redis-server" | cat
+fi
+echo
+
+SYSTEMD_COLORS=1 systemctl status "exabgpForFod" | cat
+echo
+
+SYSTEMD_COLORS=1 systemctl status "fod-gunicorn" | cat
+echo
+
+SYSTEMD_COLORS=1 systemctl status "fod-celeryd" | cat
+echo
+
-- 
GitLab