ubox: make logging code honour the hostname properly

[openwrt.git] / package / system / ubox / files / log.init

diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index be38297..53c936e 100644 (file)
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -14,12 +14,13 @@ validate_log_section()
        uci_validate_section system system "${1}" \
                'log_file:string' \
                'log_size:uinteger' \
+               'log_hostname:string' \
                'log_ip:ipaddr' \
                'log_remote:bool:1' \
                'log_port:port:514' \
                'log_proto:or("tcp", "udp"):udp' \
+               'log_trailer_null:bool:0' \
                'log_prefix:string'
-       return $?
 }
 
 validate_log_daemon()
@@ -27,7 +28,6 @@ validate_log_daemon()
        uci_validate_section system system "${1}" \
                'log_size:uinteger:0' \
                'log_buffer_size:uinteger:0'
-       return $?
 }
 
 start_service_daemon()
@@ -65,7 +65,7 @@ start_service_remote()
 {
        PIDCOUNT="$(( ${PIDCOUNT} + 1))"
        local pid_file="/var/run/logread.${PIDCOUNT}.pid"
-       local log_ip log_port log_proto log_prefix log_remote
+       local log_ip log_port log_proto log_prefix log_remote log_trailer_null log_hostname
 
        validate_log_section "${1}" || {
                echo "validation failed"
@@ -73,10 +73,14 @@ start_service_remote()
        }
        [ "${log_remote}" -ne 0 ] || return
        [ -z "${log_ip}" ] && return
+       [ -z "${log_hostname}" ] && log_hostname=$(cat /proc/sys/kernel/hostname)
 
        procd_open_instance
-       procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file"
-       [ "${log_proto}" != "udp" ] || procd_append_param command -u
+       procd_set_param command "$PROG" -f -h "$log_hostname" -r "$log_ip" "${log_port}" -p "$pid_file"
+       case "${log_proto}" in
+               "udp") procd_append_param command -u;;
+               "tcp") [ "${log_trailer_null}" -eq 1 ] && procd_append_param command -0;;
+       esac
        [ -z "${log_prefix}" ] || procd_append_param command -P "${log_prefix}"
        procd_close_instance
 }