Kconfig: use WRS_LOG_OTHER instead of WRS_LOG_WRSWATCHDOG

wrs_watchdog will use WRS_LOG_OTHER instead of WRS_LOG_WRSWATCHDOG as a destination for logs. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

Kconfig: use WRS_LOG_OTHER instead of WRS_LOG_WRSWATCHDOG
wrs_watchdog will use WRS_LOG_OTHER instead of WRS_LOG_WRSWATCHDOG as a destination for logs. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
e9b1a5f4 · Adam Wujek · b80c4996 · e9b1a5f4 · e9b1a5f4 · e9b1a5f4
Commit e9b1a5f4 authored Aug 10, 2016 by Adam Wujek 💬
7 changed files
--- a/Kconfig
+++ b/Kconfig
@@ -267,10 +267,14 @@ config WRS_LOG_MONIT
 	  Please note that unknown facility names will generate a runtime error
 	  on the switch.
-config WRS_LOG_WRSWATCHDOG
+config WRS_LOG_OTHER
-	string "Logging directions for the wrs_watchdog"
+	string "Logging directions for other programs"
 	default "daemon.info"
 	help
+	  Redirect output from other programs.
+	  In the current version following programs uses this option:
+	  --wrs_watchdog
+	  This collective entry is to avoid number of entries in dot-config.
 	  The string can be a pathname (e.g. /dev/kmsg) or a <facility>.<level>
 	  spefification like "daemon.debug". An empty strings is used
 	  to represent no logging (like /dev/null).  Please note that

--- a/configs/wrs_release_defconfig
+++ b/configs/wrs_release_defconfig
@@ -30,7 +30,7 @@ CONFIG_WRS_LOG_RTU="daemon.info"
 CONFIG_WRS_LOG_PTP="daemon.info"
 CONFIG_WRS_LOG_SNMPD="Swd"
 CONFIG_WRS_LOG_MONIT="syslog"
-CONFIG_WRS_LOG_WRSWATCHDOG="daemon.info"
+CONFIG_WRS_LOG_OTHER="daemon.info"
 # CONFIG_KEEP_ROOTFS is not set
 #

--- a/doc/wrs-user-manual.in
+++ b/doc/wrs-user-manual.in
@@ -569,9 +569,14 @@ value is changed by the web interface, proper action is taken.
 @item CONFIG_WRS_LOG_HAL
 @itemx CONFIG_WRS_LOG_RTU
 @itemx CONFIG_WRS_LOG_PTP
-@itemx CONFIG_WRS_LOG_WRSWATCHDOG
+@itemx CONFIG_WRS_LOG_OTHER
-	Logging options for the three main WRS processes. Each value
+	Logging options for the three main WRS processes and other programs.
+	@t{CONFIG_WRS_LOG_OTHER} is currently used by:
+	@itemize
+	@item wrs_watchdog
+	@end itemize
+	Each value
        can be a pathname, to select logging to file (and @t{/dev/kmsg}
        is a possible ``file'' target) or a @i{facility}.@i{level} string,
        like @t{daemon.debug}, for syslog-based logging.

--- a/userspace/rootfs_override/etc/init.d/wrs_watchdog.sh
+++ b/userspace/rootfs_override/etc/init.d/wrs_watchdog.sh
@@ -28,7 +28,7 @@ start() {
 	    echo "$0 unable to source dot-config ($dotconfig)!"
 	fi
-	WRS_LOG=$CONFIG_WRS_LOG_WRSWATCHDOG
+	WRS_LOG=$CONFIG_WRS_LOG_OTHER
 	# if empty turn it to /dev/null
 	if [ -z $WRS_LOG ]; then

--- a/userspace/rootfs_override/var/www/data/wrs-data.php
+++ b/userspace/rootfs_override/var/www/data/wrs-data.php
@@ -156,10 +156,10 @@ $WRS_FORMS = Array(
 			vname => "logptp",
 		),
 		SYSTEM_LOGS_03 => Array(
-			key => "CONFIG_WRS_LOG_WRSWATCHDOG",
+			key => "CONFIG_WRS_LOG_OTHER",
-			name => "Watchdog log",
+			name => "other applications log",
-			value => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_WRSWATCHDOG"],
+			value => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_OTHER"],
-			vname => "logwatchdog",
+			vname => "logother",
 		),
 		SYSTEM_LOGS_04 => Array(
 			key => "CONFIG_WRS_LOG_MONIT",

--- a/userspace/rootfs_override/var/www/functions.php
+++ b/userspace/rootfs_override/var/www/functions.php
@@ -1123,7 +1123,7 @@ function wrs_display_help($help_id, $name){
 		$message = str_replace("\n", "<br>", $message);
 	} else if (!strcmp($help_id, "logs")){
 		$message = "<p>Log files for the following services: <br>
-					- <b>HAL daemon</b>, <b>RTU daemon</b>, <b>PPSi daemon</b>, <b>WRS Watchdog status</b> -  The string can
+					- <b>HAL daemon</b>, <b>RTU daemon</b>, <b>PPSi daemon</b>, <b>other programs</b> -  The string can
 					  be a pathname (e.g. /dev/kmsg) or a &lt;facility&gt;.&lt;level&gt; spefification like \"daemon.debug\".
 					  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.<br>

--- a/userspace/rootfs_override/var/www/logs.php
+++ b/userspace/rootfs_override/var/www/logs.php
@@ -34,7 +34,7 @@
 		$modified = process_form($section, $subsection);
 		if($modified){
-			check_add_existing_kconfig("CONFIG_WRS_LOG_WRSWATCHDOG=");
+			check_add_existing_kconfig("CONFIG_WRS_LOG_OTHER=");
 			check_add_existing_kconfig("CONFIG_WRS_LOG_MONIT=");
 			check_add_existing_kconfig("CONFIG_WRS_LOG_SNMPD=");
 			save_kconfig();