Author: blogic
Date: 2015-04-09 12:32:18 +0200 (Thu, 09 Apr 2015)
New Revision: 45329

Modified:
   trunk/package/system/ubox/files/log.init
Log:
ubox: add log_trailer_null option to uci

this allow us to use syslog tcp with \0 trailer
instead of \n trailer (logread -0 option)

Signed-off-by: Etienne CHAMPETIER <[email protected]>

Modified: trunk/package/system/ubox/files/log.init
===================================================================
--- trunk/package/system/ubox/files/log.init    2015-04-09 10:32:08 UTC (rev 
45328)
+++ trunk/package/system/ubox/files/log.init    2015-04-09 10:32:18 UTC (rev 
45329)
@@ -18,6 +18,7 @@
                'log_remote:bool:1' \
                'log_port:port:514' \
                'log_proto:or("tcp", "udp"):udp' \
+               'log_trailer_null:bool:0' \
                'log_prefix:string'
 }
 
@@ -63,7 +64,7 @@
 {
        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
 
        validate_log_section "${1}" || {
                echo "validation failed"
@@ -74,7 +75,10 @@
 
        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
+       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
 }
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to