rootfs: add log destination option for SNMPD to dot-config

Update Kconfig Update user-manual Update snmpd's init script Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: add log destination option for SNMPD to dot-config
Update Kconfig Update user-manual Update snmpd's init script Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
59e08897 · Adam Wujek · f6c3965b · 59e08897 · 59e08897 · 59e08897
Commit 59e08897 authored Jul 03, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 3 deletions

Kconfig Kconfig +12 -0

wrs-user-manual.in doc/wrs-user-manual.in +15 -1

snmpd userspace/rootfs_override/etc/init.d/snmpd +23 -2

No files found.
--- a/Kconfig
+++ b/Kconfig
@@ -97,6 +97,18 @@ config WRS_LOG_PTP
 	  to represent no logging (like /dev/null).  Please note that
 	  unknown facility names will generate a runtime error on the switch.
+config WRS_LOG_SNMPD
+	string "Logging directions for the SNMP daemon"
+	default "sd"
+	help
+	  The string can be a pathname (e.g. /dev/kmsg) or a valid snmpd log
+	  option (without -L). "sd" or "s daemon" will forward messages to
+	  syslog with daemon as facility. To set level (i.e. 5) use
+	  "S 5 daemon". For details please check "man snmpcmd". An empty
+	  strings is used  to represent no logging (like /dev/null). Please
+	  note that unknown facility names will generate a runtime error on the
+	  switch.
 config KEEP_ROOTFS
 	bool "Keep generated filesystem and related script"
 	help

--- a/doc/wrs-user-manual.in
+++ b/doc/wrs-user-manual.in
@@ -472,7 +472,7 @@ value is changed by the web interface, proper action is taken.
        Supply Right (PSR) temperature sensors. When any temperature exceeds
        threshold level SNMP object @t{WR-SWITCH-MIB::tempWarning} will change
        accordingly.
 @item CONFIG_WRS_LOG_HAL
 @itemx CONFIG_WRS_LOG_RTU
 @itemx CONFIG_WRS_LOG_PTP
@@ -485,6 +485,20 @@ value is changed by the web interface, proper action is taken.
        unknown facility names will generate a runtime error on the switch.
        All three strings default to ``@t{daemon.info}''.
+@item CONFIG_WRS_LOG_SNMPD
+	Value can be a pathname, to select logging to file (and
+        @t{/dev/kmsg} is a possible ``file'' target) or a valid snmpd log
+        option (without -L).
+        Allowed strings are in format ``@t{s} @i{facility}'' (e.g.
+        ``@t{s daemon}'') and ``@t{s} @i{level} @i{facility}'' (e.g.
+        ``@t{s 2 daemon}''). For example, ``@t{sd}'' or ``@t{s daemon}'' will forward
+        messages to syslog with daemon as facility. To set level (i.e. 5) use
+	``@t{S 5 daemon}''. For details please check ``man snmpcmd''. An empty
+	strings selects no logging at all. Please note that unknown facility
+	names will generate a runtime error on the switch.
 @item CONFIG_PORT00_PARAMS
 @itemx CONFIG_PORT01_PARAMS
 @itemx ...

--- a/userspace/rootfs_override/etc/init.d/snmpd
+++ b/userspace/rootfs_override/etc/init.d/snmpd
@@ -2,6 +2,7 @@
 SNMP_PID=/var/run/snmpd.pid
 SNMP_CONF=/wr/etc/snmpd.conf
+dotconfig=/wr/etc/dot-config
 start_counter() {
 	# increase boot counter
@@ -17,9 +18,29 @@ start_counter() {
 start() {
    echo -n "Starting snmpd daemon: "
-    # Log to syslog at daemon level. And log source address (-a)
+    if [ -f "$dotconfig" ]; then
+	. "$dotconfig"
+    else
+	echo "$0 unable to source dot-config ($dotconfig)!"
+    fi
+    WRS_LOG=$CONFIG_WRS_LOG_SNMPD
+    if [ -z "$WRS_LOG" ]; then
+	LOG="";
+    elif echo "$WRS_LOG" | grep / > /dev/null; then
+        # if a pathname, use it
+	LOG="-Lf $WRS_LOG";
+    else
+	# not a pathname: use verbatim
+	LOG="-L$WRS_LOG"
+    fi
+    # Log source address (-a)
    start-stop-daemon -q -p $SNMP_PID -S \
-		--exec /usr/sbin/snmpd -- -Lsd -p $SNMP_PID -a -c $SNMP_CONF
+		--exec /usr/sbin/snmpd -- $LOG -p $SNMP_PID -a -c $SNMP_CONF
    ret=$?
    if [ $ret -eq 0 ]; then
 	start_counter