ubox: implement service_running() in log init.d script

[openwrt/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 a4d57e2b5d6f8ec5bfe78c89d7df11a72780c020..ba9c124c8ba6e71b875685680fde4f268f52659e 100644 (file)
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -11,35 +11,33 @@ PROG=/sbin/logread
 
 validate_log_section()
 {
-       uci_validate_section system system "${1}" \
+       uci_load_validate system system "$1" "$2" \
                '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()
 {
-       uci_validate_section system system "${1}" \
+       uci_load_validate system system "$1" "$2" \
                'log_size:uinteger:0' \
                'log_buffer_size:uinteger:0'
-       return $?
 }
 
 start_service_daemon()
 {
-       local log_buffer_size log_size
-       validate_log_daemon "${1}"
        [ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size
-       [ $log_buffer_size -eq 0 ] && log_buffer_size=16
+       [ $log_buffer_size -eq 0 ] && log_buffer_size=64
        procd_open_instance
        procd_set_param command "/sbin/logd"
        procd_append_param command -S "${log_buffer_size}"
-       procd_set_param respawn
+       procd_set_param respawn 5 1 -1
        procd_close_instance
 }
 
@@ -47,14 +45,15 @@ start_service_file()
 {
        PIDCOUNT="$(( ${PIDCOUNT} + 1))"
        local pid_file="/var/run/logread.${PIDCOUNT}.pid"
-       local log_file log_size
 
-       validate_log_section "${1}" || {
+       [ "$2" = 0 ] || {
                echo "validation failed"
                return 1
        }
        [ -z "${log_file}" ] && return
 
+       mkdir -p "$(dirname "${log_file}")"
+
        procd_open_instance
        procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
        [ -n "${log_size}" ] && procd_append_param command -S "$log_size"
@@ -65,18 +64,21 @@ 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
 
-       validate_log_section "${1}" || {
+       [ "$2" = 0 ] || {
                echo "validation failed"
                return 1
        }
-       [ "${log_enable}" -ne 0 ] || return
+       [ "${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
 }
@@ -90,7 +92,11 @@ service_triggers()
 start_service()
 {
        config_load system
-       config_foreach start_service_daemon system
-       config_foreach start_service_file system
-       config_foreach start_service_remote system
+       config_foreach validate_log_daemon system start_service_daemon
+       config_foreach validate_log_section system start_service_file
+       config_foreach validate_log_section system start_service_remote
+}
+
+service_running() {
+       procd_running log
 }