Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
86
Issues
86
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Software
Commits
10dd1935
Commit
10dd1935
authored
Jun 08, 2017
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
www: update config items in logs.php and its help
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
3ee2e67b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
11 deletions
+49
-11
wrs-data.php
userspace/rootfs_override/var/www/data/wrs-data.php
+36
-8
functions.php
userspace/rootfs_override/var/www/functions.php
+13
-3
No files found.
userspace/rootfs_override/var/www/data/wrs-data.php
View file @
10dd1935
...
...
@@ -143,35 +143,63 @@ $WRS_FORMS = Array(
'SYSTEM_LOGS'
=>
Array
(
'SYSTEM_LOGS_00'
=>
Array
(
'key'
=>
"CONFIG_WRS_LOG_HAL"
,
'name'
=>
"
HAL log
"
,
'name'
=>
"
Logging directions for the WR HAL
"
,
'value'
=>
$_SESSION
[
"KCONFIG"
][
"CONFIG_WRS_LOG_HAL"
],
'vname'
=>
"loghal"
,
),
'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"
,
'name'
=>
"
RTU log
"
,
'name'
=>
"
Logging directions for the RTU daemon
"
,
'value'
=>
$_SESSION
[
"KCONFIG"
][
"CONFIG_WRS_LOG_RTU"
],
'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"
,
'name'
=>
"
PTP log
"
,
'name'
=>
"
Logging directions for the PTP daemon
"
,
'value'
=>
$_SESSION
[
"KCONFIG"
][
"CONFIG_WRS_LOG_PTP"
],
'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"
,
'name'
=>
"
other applications log
"
,
'name'
=>
"
Logging directions for other programs
"
,
'value'
=>
$_SESSION
[
"KCONFIG"
][
"CONFIG_WRS_LOG_OTHER"
],
'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"
,
'name'
=>
"Monit log"
,
'value'
=>
$_SESSION
[
"KCONFIG"
][
"CONFIG_WRS_LOG_MONIT"
],
'vname'
=>
"logmonit"
,
),
'SYSTEM_LOGS_0
5
'
=>
Array
(
'SYSTEM_LOGS_0
9
'
=>
Array
(
'key'
=>
"CONFIG_WRS_LOG_SNMPD"
,
'name'
=>
"SNMPd log"
,
'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){
$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>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 <facility>.<level> 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>
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 <facility>.<level>,
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 <facility>.<level>, 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
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
...
...
@@ -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
\"
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.<br>
switch.
NOTE: It looks like Notice is not a default logging priority as writen in the manual.
<br>
</p>"
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment