[x-wrt] r4820 committed - Move to the openwrt init file for syslog/klogd/dmesg now that it suppo...
codesite...@google.com
Author: kemen04
Date: Fri Sep 4 14:12:38 2009
Log: Move to the openwrt init file for syslog/klogd/dmesg now that it
supports what we use. This also fixes the syslog settings not applying and
multiple copies of syslog running.
http://code.google.com/p/x-wrt/source/detail?r=4820
Deleted:
/trunk/package/webif/files/etc/config/syslog
/trunk/package/webif/files/etc/init.d/syslog
Modified:
/trunk/package/webif/Makefile
/trunk/package/webif/files/etc/init.d/dmesgbackup
/trunk/package/webif/files/usr/lib/webif/apply.sh
/trunk/package/webif/files/www/cgi-bin/webif/log-setup.sh
=======================================
--- /trunk/package/webif/files/etc/config/syslog Mon Jun 25 08:54:33 2007
+++ /dev/null
@@ -1,18 +0,0 @@
-config syslogd
- option ipaddr ''
- option port ''
- option size '16'
- option type 'circular'
- option mark '0'
- option file ''
-
-config klogd
- option conloglevel ''
-
-config dmesg
- option buffersize ''
-
-config dmesgbackup
- option enabled '0'
- option file '/var/log/dmesg'
- option gzip '1'
=======================================
--- /trunk/package/webif/files/etc/init.d/syslog Wed Jun 11 05:21:28 2008
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-
-syslogd_bin="/sbin/syslogd"
-dmesg_bin="/bin/dmesg"
-klogd_bin="/sbin/klogd"
-
-
-syslogd_config() {
- local cfg="$1"
- local type file size ipaddr port IPCALC_CMD SYSLOG_CMD
- local DEFAULT_type="circular"
- local DEFAULT_file="/var/log/messages"
- local DEFAULT_size=16
- local DEFAULT_ipaddr=""
- local DEFAULT_port=514
-
- config_get type "$cfg" type
- [ "$type" = "circular" -o "$type" = "file" ] 2>/dev/null ||
type=$DEFAULT_type
- config_get file "$cfg" file
- [ -z "$file" ] && file=$DEFAULT_file
- config_get size "$cfg" size
- [ "$size" -gt 0 ] 2>/dev/null || size=$DEFAULT_size
- config_get ipaddr "$cfg" ipaddr
- [ "$ipaddr" != "" ] && {
- IPCALC_CMD=$(which ipcalc.sh 2>/dev/null)
- [ "$IPCALC_CMD" == "" ] && IPCALC_CMD=$(which ipcalc 2>/dev/null)
- [ "$IPCALC_CMD" != "" ] && {
- eval $($IPCALC_CMD "$ipaddr")
- [ "$ipaddr" != "$IP" ] && ipaddr=""
- }
- }
- config_get port "$cfg" port
- [ "$port" -lt 1 -o "$port" -gt 65535 ] 2>/dev/null && port=$DEFAULT_port
-
- if [ "$type" = "circular" ]; then
- SYSLOG_CMD="-C$size ${ipaddr:+-L -R $ipaddr:$port} -S"
- else
- SYSLOG_CMD="-s $size -O $file ${ipaddr:+-L -R $ipaddr:$port} -S"
- fi
- $syslogd_bin $SYSLOG_CMD
-}
-
-dmesg_config() {
- local cfg="$1"
- local conloglevel buffersize
-
- config_get buffersize "$cfg" buffersize
- [ -n "$buffersize" ] && $dmesg_bin -s "$buffersize"
-}
-
-klogd_config() {
- local cfg="$1"
- local conloglevel
-
- config_get conloglevel "$cfg" conloglevel
- $klogd_bin ${conloglevel:+-c $conloglevel}
-}
-
-start() {
- [ -n "$(ps | grep [s]yslogd)" -o -n "$(ps | grep [k]logd)" ] && stop
-
- config_load syslog
- [ -f $syslogd_bin -a ! -f /etc/rc.d/S??syslog-ng ] && {
- config_foreach syslogd_config syslogd
- }
- [ -f $klogd_bin ] && {
- config_foreach klogd_config klogd
- }
- [ -f $dmesg_bin ] && {
- config_foreach dmesg_config dmesg
- }
-}
-
-stop() {
- killall syslogd
- killall klogd
-}
-
-restart() {
- stop
- start
-}
=======================================
--- /trunk/package/webif/Makefile Thu Sep 3 00:15:33 2009
+++ /trunk/package/webif/Makefile Fri Sep 4 14:12:38 2009
@@ -28,7 +28,6 @@
define Package/webif/conffiles
/etc/config/webif
/etc/config/cron
-/etc/config/syslog
/etc/ssl/openssl.cnf
/etc/httpd.conf
endef
=======================================
--- /trunk/package/webif/files/etc/init.d/dmesgbackup Wed Jun 11 05:21:28
2008
+++ /trunk/package/webif/files/etc/init.d/dmesgbackup Fri Sep 4 14:12:38
2009
@@ -24,6 +24,6 @@
}
start() {
- config_load syslog
+ config_load system
config_foreach dmesgbackup_config dmesgbackup
}
=======================================
--- /trunk/package/webif/files/usr/lib/webif/apply.sh Wed Mar 18 09:58:32
2009
+++ /trunk/package/webif/files/usr/lib/webif/apply.sh Fri Sep 4 14:12:38
2009
@@ -267,9 +267,6 @@
"wireless")
echo '@TR<<Reloading>> @TR<<wireless>> ...'
wifi ;;
- "syslog")
- echo '@TR<<Reloading>> @TR<<syslogd>> ...'
- /etc/init.d/syslog restart >&- 2>&- ;;
"webifopenvpn")
echo '@TR<<Reloading>> @TR<<OpenVPN>> ...'
if [ ! -e S??webifopenvpn ]; then
@@ -282,6 +279,8 @@
reset_cb
config_get hostname "$system_cfg" hostname
echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+ echo "If you made changes to the log settings please reboot for them to
take effect!"
+ sleep 5
config_allclear
;;
"l2tpns")
=======================================
--- /trunk/package/webif/files/www/cgi-bin/webif/log-setup.sh Sat Feb 23
13:29:26 2008
+++ /trunk/package/webif/files/www/cgi-bin/webif/log-setup.sh Fri Sep 4
14:12:38 2009
@@ -6,45 +6,20 @@
[ -n "$1" ] && eval "$1_cfg=\"$2\""
}
-uci_load syslog
-[ "$?" != "0" ] && {
- uci_set_default syslog <<EOF
-config 'syslogd'
- option 'ipaddr' ''
- option 'port' ''
- option 'size' '16'
- option 'type' 'circular'
- option 'mark' '0'
- option 'file' '/var/log/messages'
-config 'klogd'
- option 'conloglevel' ''
-config 'dmesg'
- option 'buffersize' ''
-config 'dmesgbackup'
- option 'enabled' '0'
- option 'file' '/var/log/dmesg'
- option 'gzip' '1'
-EOF
- uci_load syslog
-}
+uci_load system
if empty "$FORM_submit"; then
- eval FORM_ipaddr="\$CONFIG_${syslogd_cfg}_ipaddr"
- eval FORM_port="\$CONFIG_${syslogd_cfg}_port"
- FORM_port="${FORM_port:-514}"
-# eval FORM_mark="\$CONFIG_${syslogd_cfg}_mark"
- eval FORM_type="\$CONFIG_${syslogd_cfg}_type"
- FORM_type="${FORM_type:-circular}"
- eval FORM_file="\$CONFIG_${syslogd_cfg}_file"
- FORM_file="${FORM_file:-/var/log/messages}"
- eval FORM_size="\$CONFIG_${syslogd_cfg}_size"
- FORM_size="${FORM_size:-16}"
- eval FORM_conloglevel="\$CONFIG_${klogd_cfg}_conloglevel"
- eval FORM_buffersize="\$CONFIG_${dmesg_cfg}_buffersize"
+ config_get FORM_ipaddr "$system_cfg" log_ip
+ config_get FORM_size "$system_cfg" log_size 16
+ config_get FORM_port "$system_cfg" log_port 514
+ config_get FORM_type "$system_cfg" log_type circular
+ config_get FORM_file "$system_cfg" log_file "/var/log/messages"
+ config_get FORM_conloglevel "$system_cfg" klogconloglevel
+ config_get FORM_buffersize "$system_cfg" buffersize
config_get_bool FORM_enabled "$dmesgbackup_cfg" enabled 0
- eval FORM_kfile="\$CONFIG_${dmesgbackup_cfg}_file"
- FORM_kfile="${FORM_kfile:-/var/log/dmesg}"
+ config_get FORM_kfile "$dmesgbackup_cfg" file "/var/log/dmesg"
config_get_bool FORM_gzip "$dmesgbackup_cfg" gzip 0
+
else
SAVED=1
[ "$FORM_type" = "file" ] && file_required="required"
@@ -63,21 +38,17 @@
int|FORM_gzip|@TR<<Compress Backup>>||$FORM_gzip
EOF
equal "$?" 0 && {
- [ -z "$syslogd_cfg" ] && { uci_add syslog syslogd;
syslogd_cfg="$CONFIG_SECTION"; }
- [ -z "$klogd_cfg" ] && { uci_add syslog klogd;
klogd_cfg="$CONFIG_SECTION"; }
- [ -z "$dmesg_cfg" ] && { uci_add syslog dmesg;
dmesg_cfg="$CONFIG_SECTION"; }
- [ -z "$dmesgbackup_cfg" ] && { uci_add syslog dmesgbackup;
dmesgbackup_cfg="$CONFIG_SECTION"; }
- uci_set syslog "$syslogd_cfg" ipaddr "$FORM_ipaddr"
- uci_set syslog "$syslogd_cfg" port "$FORM_port"
- #uci_set syslog "$syslogd_cfg" mark "$FORM_mark"
- uci_set syslog "$syslogd_cfg" type "$FORM_type"
- uci_set syslog "$syslogd_cfg" file "$FORM_file"
- uci_set syslog "$syslogd_cfg" size "$FORM_size"
- uci_set syslog "$klogd_cfg" conloglevel "$FORM_conloglevel"
- uci_set syslog "$dmesg_cfg" buffersize "$FORM_buffersize"
- uci_set syslog "$dmesgbackup_cfg" enabled "$FORM_enabled"
- uci_set syslog "$dmesgbackup_cfg" file "$FORM_kfile"
- uci_set syslog "$dmesgbackup_cfg" gzip "$FORM_gzip"
+ [ -z "$dmesgbackup_cfg" ] && { uci_add system dmesgbackup;
dmesgbackup_cfg="$CONFIG_SECTION"; }
+ uci_set system "$system_cfg" log_ip "$FORM_ipaddr"
+ uci_set system "$system_cfg" log_port "$FORM_port"
+ uci_set system "$system_cfg" log_type "$FORM_type"
+ uci_set system "$system_cfg" log_file "$FORM_file"
+ uci_set system "$system_cfg" log_size "$FORM_size"
+ uci_set system "$system_cfg" klogconloglevel "$FORM_conloglevel"
+ uci_set system "$system_cfg" buffersize "$FORM_buffersize"
+ uci_set system "$dmesgbackup_cfg" enabled "$FORM_enabled"
+ uci_set system "$dmesgbackup_cfg" file "$FORM_kfile"
+ uci_set system "$dmesgbackup_cfg" gzip "$FORM_gzip"
}
fi