ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 22:47:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

procd: add validation to the log init script

Browse Source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 38879
This commit is contained in:
John Crispin 2013-11-20 16:56:41 +00:00
parent 06ada4b10f
commit 1b3a423ad5
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package/system/ubox/files/log.init
View File

@ -8,14 +8,27 @@ STOP=89
USE_PROCD=1 USE_PROCD=1
PROG=/sbin/logread PROG=/sbin/logread
validate_log_section()
{
uci_validate_section system system "${1}" \
'Password:string' \
'log_size:uinteger' \
'log_ip:ipaddr' \
'log_port:port:514' \
'log_proto:or("tcp", "udp"):udp' \
'log_prefix:string'
return $?
}
start_service_file() start_service_file()
{ {
local pid_file="/var/run/logread.${PIDCOUNT}.pid" local pid_file="/var/run/logread.${PIDCOUNT}.pid"
local log_file log_size local log_file log_size
config_get log_file $1 log_file validate_log_section "${1}" || {
config_get log_size $1 log_size echo "validation failed"
return 1
}
[ -z "${log_file}" ] && return [ -z "${log_file}" ] && return
procd_open_instance procd_open_instance
@ -27,17 +40,16 @@ start_service_file()
start_service_remote() start_service_remote()
{ {
local pid_file="/var/run/logread.${PIDCOUNT}.pid" local pid_file="/var/run/logread.${PIDCOUNT}.pid"
local log_ip log_port log_proto local log_ip log_port log_proto log_prefix
config_get log_ip $1 log_ip
config_get log_port $1 log_port
config_get log_proto $1 log_proto udp
config_get log_prefix $1 log_prefix
validate_log_section "${1}" || {
echo "validation failed"
return 1
}
[ -z "${log_ip}" ] && return [ -z "${log_ip}" ] && return
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "${log_port:-514}" -p "$pid_file" procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file"
[ "${log_proto}" != "udp" ] || procd_append_param command -u [ "${log_proto}" != "udp" ] || procd_append_param command -u
[ -z "${log_prefix}" ] || procd_append_param command -P ${log_prefix} [ -z "${log_prefix}" ] || procd_append_param command -P ${log_prefix}
procd_close_instance procd_close_instance
@ -46,6 +58,7 @@ start_service_remote()
service_triggers() service_triggers()
{ {
procd_add_config_trigger "system" "/etc/init.d/log" "start" procd_add_config_trigger "system" "/etc/init.d/log" "start"
procd_add_validation validate_log_section
} }
start_service() start_service()