From 2ba0865d462db6a52468df74957a6fdc9fb00ae1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Fri, 9 Jul 2021 08:19:18 +0000 Subject: [PATCH] start-eddn-service: Add 'bounce' & `ps` only on PID * The ps options for filtering are logical OR, not AND, and there seems to be no way to have them be ANDed instead. --- systemd/start-eddn-service | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systemd/start-eddn-service b/systemd/start-eddn-service index c3d0d11..1e915eb 100755 --- a/systemd/start-eddn-service +++ b/systemd/start-eddn-service @@ -9,7 +9,7 @@ EXIT_CL_ARGS=3 EXIT_SERVICE_ALREADY_RUNNING=4 usage() { - echo "Usage: $(basename $0) ( live | beta | dev ) ( gateway | monitor | relay ) [ --from-source [ --background ] ]" >&2 + echo "Usage: $(basename $0) ( live | beta | dev ) ( gateway | monitor | relay | bounce ) [ --from-source [ --background ] ]" >&2 } if [ -z "${1}" ]; @@ -79,7 +79,7 @@ then if [ -f "${LOG_DIR}/${SERVICE}.pid" ]; then - if ps -C python -p $(cat "${LOG_DIR}/${SERVICE}.pid") > /dev/null 2>&1; + if ps -p $(cat "${LOG_DIR}/${SERVICE}.pid") > /dev/null 2>&1; then echo "${SERVICE}: already running as PID $(cat "${LOG_DIR}/${SERVICE}.pid")" >&2 exit ${EXIT_SERVICE_ALREADY_RUNNING} @@ -105,7 +105,7 @@ else # We need to ensure there isn't already one, via the .pid file if [ -f "${LOG_DIR}/${SERVICE}.pid" ]; then - if ps -C python -p $(cat "${LOG_DIR}/${SERVICE}.pid") > /dev/null 2>&1; + if ps -p $(cat "${LOG_DIR}/${SERVICE}.pid") > /dev/null 2>&1; then echo "${SERVICE}: already running as PID $(cat "${LOG_DIR}/${SERVICE}.pid")" >&2 exit ${EXIT_SERVICE_ALREADY_RUNNING}