OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 9... Line 9...
9 USE_PROCD=1 9 USE_PROCD=1
10 PROG=/sbin/logread 10 PROG=/sbin/logread
Line 11... Line 11...
11   11  
12 validate_log_section() 12 validate_log_section()
13 { 13 {
14 uci_load_validate system system "$1" "$2" \ 14 uci_validate_section system system "${1}" \
15 'log_file:string' \ 15 'log_file:string' \
16 'log_size:uinteger' \ 16 'log_size:uinteger' \
17 'log_hostname:string' \ 17 'log_hostname:string' \
18 'log_ip:ipaddr' \ 18 'log_ip:ipaddr' \
Line 23... Line 23...
23 'log_prefix:string' 23 'log_prefix:string'
24 } 24 }
Line 25... Line 25...
25   25  
26 validate_log_daemon() 26 validate_log_daemon()
27 { 27 {
28 uci_load_validate system system "$1" "$2" \ 28 uci_validate_section system system "${1}" \
29 'log_size:uinteger:0' \ 29 'log_size:uinteger:0' \
30 'log_buffer_size:uinteger:0' 30 'log_buffer_size:uinteger:0'
Line 31... Line 31...
31 } 31 }
32   32  
-   33 start_service_daemon()
-   34 {
33 start_service_daemon() 35 local log_buffer_size log_size
34 { 36 validate_log_daemon "${1}"
35 [ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size 37 [ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size
36 [ $log_buffer_size -eq 0 ] && log_buffer_size=64 38 [ $log_buffer_size -eq 0 ] && log_buffer_size=64
37 procd_open_instance 39 procd_open_instance
Line 43... Line 45...
43   45  
44 start_service_file() 46 start_service_file()
45 { 47 {
46 PIDCOUNT="$(( ${PIDCOUNT} + 1))" 48 PIDCOUNT="$(( ${PIDCOUNT} + 1))"
-   49 local pid_file="/var/run/logread.${PIDCOUNT}.pid"
Line 47... Line 50...
47 local pid_file="/var/run/logread.${PIDCOUNT}.pid" 50 local log_file log_size
48   51  
49 [ "$2" = 0 ] || { 52 validate_log_section "${1}" || {
50 echo "validation failed" 53 echo "validation failed"
51 return 1 54 return 1
Line 62... Line 65...
62   65  
63 start_service_remote() 66 start_service_remote()
64 { 67 {
65 PIDCOUNT="$(( ${PIDCOUNT} + 1))" 68 PIDCOUNT="$(( ${PIDCOUNT} + 1))"
-   69 local pid_file="/var/run/logread.${PIDCOUNT}.pid"
Line 66... Line 70...
66 local pid_file="/var/run/logread.${PIDCOUNT}.pid" 70 local log_ip log_port log_proto log_prefix log_remote log_trailer_null log_hostname
67   71  
68 [ "$2" = 0 ] || { 72 validate_log_section "${1}" || {
69 echo "validation failed" 73 echo "validation failed"
70 return 1 74 return 1
71 } 75 }
Line 90... Line 94...
90 } 94 }
Line 91... Line 95...
91   95  
92 start_service() 96 start_service()
93 { 97 {
94 config_load system 98 config_load system
95 config_foreach validate_log_daemon system start_service_daemon 99 config_foreach start_service_daemon system
96 config_foreach validate_log_section system start_service_file 100 config_foreach start_service_file system
97 config_foreach validate_log_section system start_service_remote 101 config_foreach start_service_remote system