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>
This commit is contained in:
Jo-Philipp Wich 2023-07-27 13:31:18 +02:00
parent 4af0a72a65
commit 4987a409a7
2 changed files with 27 additions and 5 deletions
package/system/procd

@ -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

@ -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
}