diff --git a/runfod.sh b/runfod.sh index 97da0c00fa828c9da5e32e3f803e18718455210c..457c2e29a7782b3b92413eebe65370936a765df5 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 0000000000000000000000000000000000000000..d1d8b5c500f2ac91519e0d218727bc59add92dbe --- /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 +