aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudiu Brasovean <cbrasho@gmail.com>2017-02-28 11:51:01 +0200
committerFelix Fietkau <nbd@nbd.name>2017-03-07 11:40:36 +0100
commitc70c6ac070223114ee8c9f33e5e416edb005ca83 (patch)
treeb32f900dd96aeffde185f066cc6ec9000e7a8207
parent0504cd22aa43b3af9f0a6a63f3904e06e6959bc4 (diff)
downloadupstream-c70c6ac070223114ee8c9f33e5e416edb005ca83.tar.gz
upstream-c70c6ac070223114ee8c9f33e5e416edb005ca83.tar.bz2
upstream-c70c6ac070223114ee8c9f33e5e416edb005ca83.zip
procd.sh: use parameterized respawn values
continue work started here: http://patchwork.ozlabs.org/patch/520859 Extend /etc/config/system with parameters to set the default respawn treshold and respawn timeout for procd launched services that have respawn enabled. This results in cleaner init scripts, while making sure services have respawn parameters set. Signed-off-by: Claudiu Brasovean <cbrasho@gmail.com>
-rw-r--r--package/system/procd/files/procd.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 6347de57ab..9fbf47e602 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -351,8 +351,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