aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-06 09:34:30 +0000
committerJohn Crispin <john@openwrt.org>2014-06-06 09:34:30 +0000
commitbd179b2610d361a2140f5249b14f3c8779c484cc (patch)
tree332a7b69e8a63ee73794ef28ac6eab39c2984939
parent43dc78425c12c5c6421e0021d745031b5c247b4c (diff)
downloadupstream-bd179b2610d361a2140f5249b14f3c8779c484cc.tar.gz
upstream-bd179b2610d361a2140f5249b14f3c8779c484cc.tar.bz2
upstream-bd179b2610d361a2140f5249b14f3c8779c484cc.zip
procd: service instances can now report an error of why they failed to start.
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41031
-rw-r--r--package/system/procd/Makefile4
-rw-r--r--package/system/procd/files/procd.sh13
2 files changed, 15 insertions, 2 deletions
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 4047177378..adc8933e0f 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -1,14 +1,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=procd
-PKG_VERSION:=2014-06-05
+PKG_VERSION:=2014-06-06
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/luci2/procd.git
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
CMAKE_INSTALL:=1
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index bee3293837..228652db97 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -131,6 +131,11 @@ _procd_set_param() {
command|netdev|file|respawn|watch)
_procd_add_array "$type" "$@"
;;
+ error)
+ json_add_array "$type"
+ json_add_string "" "$@"
+ json_close_array
+ ;;
nice)
json_add_int "$type" "$1"
;;
@@ -207,8 +212,13 @@ _procd_add_validation() {
_procd_append_param() {
local type="$1"; shift
+ local _json_no_warning=1
json_select "$type"
+ [ $? = 0 ] || {
+ _procd_set_param "$type" "$@"
+ return
+ }
case "$type" in
env|data|limits)
_procd_add_table_data "$@"
@@ -216,6 +226,9 @@ _procd_append_param() {
command|netdev|file|respawn|watch)
_procd_add_array_data "$@"
;;
+ error)
+ json_add_string "" "$@"
+ ;;
esac
json_select ..
}