Author: luka Date: 2016-05-11 00:37:12 +0200 (Wed, 11 May 2016) New Revision: 49354
Modified: trunk/package/system/ubox/files/log.init Log: ubox: make logging code honour the hostname properly Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/system/ubox/files/log.init =================================================================== --- trunk/package/system/ubox/files/log.init 2016-05-10 22:37:10 UTC (rev 49353) +++ trunk/package/system/ubox/files/log.init 2016-05-10 22:37:12 UTC (rev 49354) @@ -14,6 +14,7 @@ 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' \ @@ -64,7 +65,7 @@ { PIDCOUNT="$(( ${PIDCOUNT} + 1))" 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}" || { echo "validation failed" @@ -72,9 +73,10 @@ } [ "${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" + 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;; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
