KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ubox: make logging code honour the hostname properly

Browse source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2016-05-06 21:05:41 +02:00 committed by Jo-Philipp Wich
parent c3cf3c4ec4
commit a4571b7631
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/system/ubox/files/log.init
View file

@ -14,6 +14,7 @@ validate_log_section()
uci_validate_section system system "${1}" \ uci_validate_section system system "${1}" \
'log_file:string' \ 'log_file:string' \
'log_size:uinteger' \ 'log_size:uinteger' \
'log_hostname:string' \
'log_ip:ipaddr' \ 'log_ip:ipaddr' \
'log_remote:bool:1' \ 'log_remote:bool:1' \
'log_port:port:514' \ 'log_port:port:514' \
@ -64,7 +65,7 @@ start_service_remote()
{ {
PIDCOUNT="$(( ${PIDCOUNT} + 1))" PIDCOUNT="$(( ${PIDCOUNT} + 1))"
local pid_file="/var/run/logread.${PIDCOUNT}.pid" local pid_file="/var/run/logread.${PIDCOUNT}.pid"
local log_ip log_port log_proto log_prefix log_remote log_trailer_null local log_ip log_port log_proto log_prefix log_remote log_trailer_null log_hostname
validate_log_section "${1}" || { validate_log_section "${1}" || {
echo "validation failed" echo "validation failed"
@ -72,9 +73,10 @@ start_service_remote()
} }
[ "${log_remote}" -ne 0 ] || return [ "${log_remote}" -ne 0 ] || return
[ -z "${log_ip}" ] && return [ -z "${log_ip}" ] && return
[ -z "${log_hostname}" ] && log_hostname=$(cat /proc/sys/kernel/hostname)
procd_open_instance procd_open_instance
procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file" procd_set_param command "$PROG" -f -h "$log_hostname" -r "$log_ip" "${log_port}" -p "$pid_file"
case "${log_proto}" in case "${log_proto}" in
"udp") procd_append_param command -u;; "udp") procd_append_param command -u;;
"tcp") [ "${log_trailer_null}" -eq 1 ] && procd_append_param command -0;; "tcp") [ "${log_trailer_null}" -eq 1 ] && procd_append_param command -0;;