diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-05-10 22:37:12 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-06-19 19:34:18 +0200 |
| commit | aeccfb0f633c23ade519eca103d866c87fd46aec (patch) | |
| tree | ce4aea7ccaa4fda4caa909265d5743ad72be6c6a | |
| parent | 8248da4d7439694749a3fb0c817da72c347d73c5 (diff) | |
| download | master-187ad058-aeccfb0f633c23ade519eca103d866c87fd46aec.tar.gz master-187ad058-aeccfb0f633c23ade519eca103d866c87fd46aec.tar.bz2 master-187ad058-aeccfb0f633c23ade519eca103d866c87fd46aec.zip | |
ubox: make logging code honour the hostname properly
Signed-off-by: John Crispin <john@phrozen.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49354 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/system/ubox/files/log.init | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init index 4fc00d5c23..53c936e246 100644 --- a/package/system/ubox/files/log.init +++ b/package/system/ubox/files/log.init @@ -14,6 +14,7 @@ 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' \ @@ -64,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 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 @@ 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" + 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;; |