Skip to content

W
White Rabbit Switch - Software
Commit 10dd1935 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

www: update config items in logs.php and its help 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 3ee2e67b
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 11 deletions
userspace/rootfs_override/var/www/data/wrs-data.php
View file @ 10dd1935
...@@ -143,35 +143,63 @@ $WRS_FORMS = Array( ...@@ -143,35 +143,63 @@ $WRS_FORMS = Array(
'SYSTEM_LOGS' => Array( 'SYSTEM_LOGS' => Array(
'SYSTEM_LOGS_00' => Array( 'SYSTEM_LOGS_00' => Array(
'key' => "CONFIG_WRS_LOG_HAL", 'key' => "CONFIG_WRS_LOG_HAL",
'name' => "HAL log", 'name' => "Logging directions for the WR HAL",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_HAL"], 'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_HAL"],
'vname' => "loghal", 'vname' => "loghal",
), ),
'SYSTEM_LOGS_01' => Array( 'SYSTEM_LOGS_01' => Array(
'key' => "CONFIG_WRS_LOG_LEVEL_HAL",
'name' => "Logging verbosity level for the WR HAL",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_LEVEL_HAL"],
'vname' => "loglevelhal",
),
'SYSTEM_LOGS_02' => Array(
'key' => "CONFIG_WRS_LOG_RTU", 'key' => "CONFIG_WRS_LOG_RTU",
'name' => "RTU log", 'name' => "Logging directions for the RTU daemon",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_RTU"], 'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_RTU"],
'vname' => "logrtu", 'vname' => "logrtu",
), ),
'SYSTEM_LOGS_02' => Array( 'SYSTEM_LOGS_03' => Array(
'key' => "CONFIG_WRS_LOG_LEVEL_RTU",
'name' => "Logging verbosity level for the RTU daemon",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_LEVEL_RTU"],
'vname' => "loglevelrtu",
),
'SYSTEM_LOGS_04' => Array(
'key' => "CONFIG_WRS_LOG_PTP", 'key' => "CONFIG_WRS_LOG_PTP",
'name' => "PTP log", 'name' => "Logging directions for the PTP daemon",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_PTP"], 'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_PTP"],
'vname' => "logptp", 'vname' => "logptp",
), ),
'SYSTEM_LOGS_03' => Array( 'SYSTEM_LOGS_05' => Array(
'key' => "CONFIG_WRS_LOG_LEVEL_PTP",
'name' => "Logging verbosity level for the PTP daemon",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_LEVEL_PTP"],
'vname' => "loglevelptp",
),
'SYSTEM_LOGS_06' => Array(
'key' => "CONFIG_WRS_LOG_OTHER", 'key' => "CONFIG_WRS_LOG_OTHER",
'name' => "other applications log", 'name' => "Logging directions for other programs",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_OTHER"], 'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_OTHER"],
'vname' => "logother", 'vname' => "logother",
), ),
'SYSTEM_LOGS_04' => Array( 'SYSTEM_LOGS_07' => Array(
'key' => "CONFIG_WRS_LOG_LEVEL_OTHER",
'name' => "Logging verbosity level for other programs",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_LEVEL_OTHER"],
'vname' => "loglevelother",
),
'SYSTEM_LOGS_08' => Array(
'key' => "CONFIG_WRS_LOG_MONIT", 'key' => "CONFIG_WRS_LOG_MONIT",
'name' => "Monit log", 'name' => "Monit log",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_MONIT"], 'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_MONIT"],
'vname' => "logmonit", 'vname' => "logmonit",
), ),
'SYSTEM_LOGS_05' => Array( 'SYSTEM_LOGS_09' => Array(
'key' => "CONFIG_WRS_LOG_SNMPD", 'key' => "CONFIG_WRS_LOG_SNMPD",
'name' => "SNMPd log", 'name' => "SNMPd log",
'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_SNMPD"], 'value' => $_SESSION["KCONFIG"]["CONFIG_WRS_LOG_SNMPD"],
......
userspace/rootfs_override/var/www/functions.php
View file @ 10dd1935
...@@ -1102,10 +1102,20 @@ function wrs_display_help($help_id, $name){ ...@@ -1102,10 +1102,20 @@ function wrs_display_help($help_id, $name){
$message = str_replace("\n", "<br>", $message); $message = str_replace("\n", "<br>", $message);
} else if (!strcmp($help_id, "logs")){ } else if (!strcmp($help_id, "logs")){
$message = "<p>Log files for the following services: <br> $message = "<p>Log files for the following services: <br>
- <b>HAL daemon</b>, <b>RTU daemon</b>, <b>PPSi daemon</b>, <b>other programs</b> - The string can - Logging directions for <b>HAL daemon</b>, <b>RTU daemon</b>, <b>PPSi/PTP daemon</b>, <b>other programs</b>
(wrs_watchdog, wrs_auxclk, wrs_custom_boot_script.sh, vlan.sh)
- The string can
be a pathname (e.g. /dev/kmsg) or a &lt;facility&gt;.&lt;level&gt; spefification like \"daemon.debug\". 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 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> names will generate a runtime error on the switch. Please note that all messages produced by programs
if syslog is configured will be passed to the syslog at the same &lt;facility&gt;.&lt;level&gt,
no matter of verbosity of a message.<br>
- Logging verbosity level for <b>HAL daemon</b>, <b>RTU daemon</b>, <b>PPSi/PTP daemon</b>, <b>other programs</b>
(wrs_watchdog, wrs_auxclk, wrs_custom_boot_script.sh, vlan.sh)
- Specify verbosity of programs as a string.
By leaving this item empty, a daemon will use its default verbosity level, which is usually INFO.
Please note that all messages produced by a program if syslog is configured will be passed to the syslog
at the same &lt;facility&gt;.&lt;level&gt, no matter of verbosity of a message.<br>
- <b>Monit</b> - The string can be a pathname (e.g. /dev/kmsg) or a \"syslog\" string. An empty strings - <b>Monit</b> - The string can be a pathname (e.g. /dev/kmsg) or a \"syslog\" string. An empty strings
is used to represent no logging. If it is needed to select facility and level please leave here empty is used to represent no logging. If it is needed to select facility and level please leave here empty
string and change /etc/monitrc file directly. Please note that unknown facility names will generate a string and change /etc/monitrc file directly. Please note that unknown facility names will generate a
...@@ -1114,7 +1124,7 @@ function wrs_display_help($help_id, $name){ ...@@ -1114,7 +1124,7 @@ function wrs_display_help($help_id, $name){
\"sd\" or \"s daemon\" will forward messages to syslog with daemon as facility. To set level (i.e. 5) use \"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 \"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 logging (like /dev/null). Please note that unknown facility names will generate a runtime error on the
switch.<br> switch. NOTE: It looks like Notice is not a default logging priority as writen in the manual.<br>
</p>"; </p>";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment