procd: procd_send_signal use signal names

[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 8f18cda70e65b7b33ff6029d8e3ac4e357bf411c..b4b6faa6627af447108bb6542d7c63af65e818a2 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -38,6 +38,20 @@
 PROCD_RELOAD_DELAY=1000
 _PROCD_SERVICE=
 
+procd_lock() {
+       local basescript=$(readlink "$initscript")
+       local service_name="$(basename ${basescript:-$initscript})"
+
+       flock -n 1000 &> /dev/null
+       if [ "$?" != "0" ]; then
+               exec 1000>/var/lock/procd_${service_name}.lock
+               flock 1000
+               if [ "$?" != "0" ]; then
+                       logger "warning: procd flock for $service_name failed"
+               fi
+       fi
+}
+
 _procd_call() {
        local old_cb
 
@@ -47,6 +61,7 @@ _procd_call() {
 }
 
 _procd_wrapper() {
+       procd_lock
        while [ -n "$1" ]; do
                eval "$1() { _procd_call _$1 \"\$@\"; }"
                shift
@@ -79,6 +94,9 @@ _procd_close_service() {
        _procd_open_trigger
        service_triggers
        _procd_close_trigger
+       _procd_open_data
+       service_data
+       _procd_close_data
        _procd_ubus_call ${1:-set}
 }
 
@@ -134,6 +152,18 @@ _procd_close_trigger() {
        json_close_array
 }
 
+_procd_open_data() {
+       let '_procd_data_open = _procd_data_open + 1'
+       [ "$_procd_data_open" -gt 1 ] && return
+       json_add_object "data"
+}
+
+_procd_close_data() {
+       let '_procd_data_open = _procd_data_open - 1'
+       [ "$_procd_data_open" -lt 1 ] || return
+       json_close_object
+}
+
 _procd_open_validate() {
        json_select ..
        json_add_array "validate"
@@ -213,9 +243,12 @@ _procd_set_param() {
                        json_add_string "" "$@"
                        json_close_array
                ;;
-               nice|reload_signal)
+               nice|term_timeout)
                        json_add_int "$type" "$1"
                ;;
+               reload_signal)
+                       json_add_int "$type" $(kill -l "$1")
+               ;;
                pidfile|user|seccomp|capabilities)
                        json_add_string "$type" "$1"
                ;;
@@ -248,9 +281,8 @@ _procd_add_interface_trigger() {
        json_close_array
 
        json_close_array
-       json_close_array
-
        _procd_add_timeout
+       json_close_array
 }
 
 _procd_add_reload_interface_trigger() {
@@ -280,10 +312,8 @@ _procd_add_config_trigger() {
        json_close_array
 
        json_close_array
-
-       json_close_array
-
        _procd_add_timeout
+       json_close_array
 }
 
 _procd_add_raw_trigger() {
@@ -351,8 +381,10 @@ _procd_close_instance() {
        if json_select respawn ; then
                json_get_values respawn_vals
                if [ -z "$respawn_vals" ]; then
+                       local respawn_threshold=$(uci_get system.@service[0].respawn_threshold)
+                       local respawn_timeout=$(uci_get system.@service[0].respawn_timeout)
                        local respawn_retry=$(uci_get system.@service[0].respawn_retry)
-                       _procd_add_array_data 3600 5 ${respawn_retry:-5}
+                       _procd_add_array_data ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
                fi
                json_select ..
        fi
@@ -381,6 +413,10 @@ _procd_send_signal() {
        local instance="$2"
        local signal="$3"
 
+       case "$signal" in
+               [A-Z]*) signal="$(kill -l "$signal" 2>/dev/null)" || return 1;;
+       esac
+
        json_init
        json_add_string name "$service"
        [ -n "$instance" -a "$instance" != "*" ] && json_add_string instance "$instance"
@@ -421,7 +457,7 @@ procd_add_mdns_service() {
        json_add_int port "$port"
        [ -n "$1" ] && {
                json_add_array txt
-               for txt in $@; do json_add_string "" $txt; done
+               for txt in "$@"; do json_add_string "" "$txt"; done
                json_select ..
        }
        json_select ..
@@ -430,7 +466,7 @@ procd_add_mdns_service() {
 procd_add_mdns() {
        procd_open_data
        json_add_object "mdns"
-       procd_add_mdns_service $@
+       procd_add_mdns_service "$@"
        json_close_object
        procd_close_data
 }