procd: update procd.sh to support sending kill signal to a service

[openwrt/openwrt.git] / package / system / procd / files / procd.sh

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 693a045be57fa42a436684232104c6c1de73c52a..8f18cda70e65b7b33ff6029d8e3ac4e357bf411c 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -29,9 +29,13 @@
 # procd_kill(service, [instance]):
 #   Kill a service instance (or all instances)
 #
+# procd_send_signal(service, [instance], [signal])
+#   Send a signal to a service instance (or all instances)
+#
 
 . $IPKG_INSTROOT/usr/share/libubox/jshn.sh
 
+PROCD_RELOAD_DELAY=1000
 _PROCD_SERVICE=
 
 _procd_call() {
@@ -75,7 +79,7 @@ _procd_close_service() {
        _procd_open_trigger
        service_triggers
        _procd_close_trigger
-       _procd_ubus_call set
+       _procd_ubus_call ${1:-set}
 }
 
 _procd_add_array_data() {
@@ -209,7 +213,7 @@ _procd_set_param() {
                        json_add_string "" "$@"
                        json_close_array
                ;;
-               nice)
+               nice|reload_signal)
                        json_add_int "$type" "$1"
                ;;
                pidfile|user|seccomp|capabilities)
@@ -221,6 +225,11 @@ _procd_set_param() {
        esac
 }
 
+_procd_add_timeout() {
+       [ "$PROCD_RELOAD_DELAY" -gt 0 ] && json_add_int "" "$PROCD_RELOAD_DELAY"
+       return 0
+}
+
 _procd_add_interface_trigger() {
        json_add_array
        _procd_add_array_data "$1"
@@ -240,6 +249,8 @@ _procd_add_interface_trigger() {
 
        json_close_array
        json_close_array
+
+       _procd_add_timeout
 }
 
 _procd_add_reload_interface_trigger() {
@@ -271,6 +282,8 @@ _procd_add_config_trigger() {
        json_close_array
 
        json_close_array
+
+       _procd_add_timeout
 }
 
 _procd_add_raw_trigger() {
@@ -363,6 +376,18 @@ _procd_kill() {
        _procd_ubus_call delete
 }
 
+_procd_send_signal() {
+       local service="$1"
+       local instance="$2"
+       local signal="$3"
+
+       json_init
+       json_add_string name "$service"
+       [ -n "$instance" -a "$instance" != "*" ] && json_add_string instance "$instance"
+       [ -n "$signal" ] && json_add_int signal "$signal"
+       _procd_ubus_call signal
+}
+
 procd_open_data() {
        local name="$1"
        json_set_namespace procd __procd_old_cb
@@ -447,4 +472,5 @@ _procd_wrapper \
        procd_append_param \
        procd_add_validation \
        procd_set_config_changed \
-       procd_kill
+       procd_kill \
+       procd_send_signal