diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2023-07-27 13:31:18 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2023-07-27 13:31:18 +0200 |
| commit | 4987a409a7486ee5c6b9ef93f6783b1e4f29dea2 (patch) | |
| tree | c8ea3849f802df725c85cc2b48c1caf675b8c254 /package/system | |
| parent | 4af0a72a65d7c92ed4e7c2455090f695f424903d (diff) | |
| download | openwrt-4987a409a7486ee5c6b9ef93f6783b1e4f29dea2.tar.gz openwrt-4987a409a7486ee5c6b9ef93f6783b1e4f29dea2.tar.bz2 openwrt-4987a409a7486ee5c6b9ef93f6783b1e4f29dea2.zip | |
procd: improve status reporting for partially running services
The existing implementation incorrectly reported `running` for services
without any instances or with all instances stopped/terminated.
Improve the default implementation of `/etc/init.d/* status` to properly
report services with not running instances. In case a service exists,
but without running instance, the status call will now report
"not running" with exit code 5. In case some instances are running and
some are stopped/terminated, the call will report "running (X/Y)" where
`X` denoted the amount of running instances and `Y` the amount of total
registered ones.
Ref: https://forum.openwrt.org/t/x/159443
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/system')
| -rw-r--r-- | package/system/procd/Makefile | 2 | ||||
| -rw-r--r-- | package/system/procd/files/procd.sh | 30 |
2 files changed, 27 insertions, 5 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 9e829a2159..d0576c1259 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 5148b2f03c..8ee25f4f08 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -524,7 +524,10 @@ _procd_send_signal() { _procd_status() { local service="$1" local instance="$2" - local data + local data state + local n_running=0 + local n_stopped=0 + local n_total=0 json_init [ -n "$service" ] && json_add_string name "$service" @@ -539,10 +542,29 @@ _procd_status() { fi [ -n "$instance" ] && instance="\"$instance\"" || instance='*' - if [ -z "$(echo "$data" | jsonfilter -e '$['"$instance"']')" ]; then - echo "unknown instance $instance"; return 4 + + for state in $(jsonfilter -s "$data" -e '$['"$instance"'].running'); do + n_total=$((n_total + 1)) + case "$state" in + false) n_stopped=$((n_stopped + 1)) ;; + true) n_running=$((n_running + 1)) ;; + esac + done + + if [ $n_total -gt 0 ]; then + if [ $n_running -gt 0 ] && [ $n_stopped -eq 0 ]; then + echo "running" + return 0 + elif [ $n_running -gt 0 ]; then + echo "running ($n_running/$n_total)" + return 0 + else + echo "not running" + return 5 + fi else - echo "running"; return 0 + echo "unknown instance $instance" + return 4 fi } |