htpdate: modify init scripts to use procd and uci configuration

Modify init script to use standard uci configuration and procd for
process management. We benefit from:
- use of standard LEDE configuration with its ability to revert and
  commit changes
- validation of configuration variables
- procd taking care of restarting daemon when config changes and user
  wants to reload it
- automatic respawning of daemon process in case it dies

The source is patched to make it possible to run as a daemon in
foreground.

Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
This commit is contained in:
Marcin Jurkowski
2017-07-25 23:37:57 +02:00
parent df1f3a41c8
commit 73dbc6cf92
5 changed files with 103 additions and 17 deletions
+11
View File
@@ -0,0 +1,11 @@
config htpdate 'htpdate'
option enabled 1
list server 'www.google.com'
list server 'www.yahoo.com'
list server 'www.linux.com'
list server 'www.freebsd.org'
option proxy_host ''
option proxy_port '8080'
option debug 0
option sanity_check 1
#list option '-4'
-1
View File
@@ -1 +0,0 @@
OPTIONS="www.google.com www.yahoo.com www.linux.org www.freebsd.org"
+45 -10
View File
@@ -2,18 +2,53 @@
# Copyright (C) 2006 OpenWrt.org
START=49
BIN=htpdate
DEFAULT=/etc/default/$BIN
RUN_D=/var/run
PID_F=$RUN_D/$BIN.pid
USE_PROCD=1
PROG=/usr/sbin/htpdate
start() {
[ -f $DEFAULT ] && . $DEFAULT
mkdir -p $RUN_D
$BIN -l -s -t $OPTIONS && $BIN -D $OPTIONS
validate_htpdate_section() {
uci_validate_section htpdate htpdate "${1}" \
'server:list(host)' \
'proxy_host:host' \
'proxy_port:port:8080' \
'debug:bool:0' \
'sanity_check:bool:1' \
'option:list(string)' \
'enabled:bool:1'
}
stop() {
[ -f $PID_F ] && kill $(cat $PID_F)
start_service() {
local server proxy debug sanity_check option enabled
validate_htpdate_section htpdate || {
echo "validation failed"
return 1
}
[ "$enabled" = 0 ] && return
procd_open_instance
procd_set_param command "$PROG" -f
[ -n "$proxy" ] && procd_append_param command -P $proxy:$proxy_port
[ "$debug" = "1" ] && procd_append_param command -d
[ "$sanity_check" = "0" ] && procd_append_param command -t
[ -n "$option" ] && procd_append_param command $option
for peer in $server; do
procd_append_param command $peer
done
procd_set_param stdout 1
procd_set_param stderr 1
procd_set_param respawn
procd_close_instance
}
service_triggers() {
procd_add_reload_trigger "htpdate"
procd_add_validation validate_htpdate_section
}