KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

procd: service instances can now report an error of why they failed to start.

Browse source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41031
This commit is contained in:
John Crispin 2014-06-06 09:34:30 +00:00
parent 43dc78425c
commit bd179b2610
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/system/procd/Makefile
View file

@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=procd PKG_NAME:=procd
PKG_VERSION:=2014-06-05 PKG_VERSION:=2014-06-06
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=45ca87272954f46eb6d55365d5a2fbe3520d66ce PKG_SOURCE_VERSION:=53c1ea6b9ade10eff3cec07519db862b365a4233
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1

13
package/system/procd/files/procd.sh
View file

@ -131,6 +131,11 @@ _procd_set_param() {
command|netdev|file|respawn|watch) command|netdev|file|respawn|watch)
_procd_add_array "$type" "$@" _procd_add_array "$type" "$@"
;; ;;
error)
json_add_array "$type"
json_add_string "" "$@"
json_close_array
;;
nice) nice)
json_add_int "$type" "$1" json_add_int "$type" "$1"
;; ;;
@ -207,8 +212,13 @@ _procd_add_validation() {
_procd_append_param() { _procd_append_param() {
local type="$1"; shift local type="$1"; shift
local _json_no_warning=1
json_select "$type" json_select "$type"
[ $? = 0 ] || {
_procd_set_param "$type" "$@"
return
}
case "$type" in case "$type" in
env|data|limits) env|data|limits)
_procd_add_table_data "$@" _procd_add_table_data "$@"
@ -216,6 +226,9 @@ _procd_append_param() {
command|netdev|file|respawn|watch) command|netdev|file|respawn|watch)
_procd_add_array_data "$@" _procd_add_array_data "$@"
;; ;;
error)
json_add_string "" "$@"
;;
esac esac
json_select .. json_select ..
} }