procd: fix invalid JSON filter expression in procd_running()
Since service and instance names may contain characters which are not allowed
in JSON path labels, such as dashes or spaces, change the filter expression
to array square bracket notation to properly match these cases as well.
Fixes: 2c3dd70741 ("procd: add procd_running() helper for checking running state")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -412,7 +412,7 @@ procd_running() {
|
||||
|
||||
json_init
|
||||
json_add_string name "$service"
|
||||
running=$(_procd_ubus_call list | jsonfilter -e "@.$service.instances.${instance}.running")
|
||||
running=$(_procd_ubus_call list | jsonfilter -e "@['$service'].instances['$instance'].running")
|
||||
|
||||
[ "$running" = "true" ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user