tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LoggingConfigForm: provide less Syslog facilities 

refs #11214
This commit is contained in:
Alexander A. Klimov 2016-10-24 10:43:27 +02:00
parent 52e6293b96
commit 00af3d61b7
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/forms/Config/General/LoggingConfigForm.php
View File

@ -112,11 +112,7 @@ class LoggingConfigForm extends Form
'description' => $this->translate('The syslog facility to utilize.'),
'value' => 'user',
'multiOptions' => array(
'auth' => 'LOG_AUTH',
'authpriv' => 'LOG_AUTHPRIV',
'cron' => 'LOG_CRON',
'daemon' => 'LOG_DAEMON',
'kern' => 'LOG_KERN',
'user' => 'LOG_USER',
'local0' => 'LOG_LOCAL0',
'local1' => 'LOG_LOCAL1',
'local2' => 'LOG_LOCAL2',
@ -124,13 +120,7 @@ class LoggingConfigForm extends Form
'local4' => 'LOG_LOCAL4',
'local5' => 'LOG_LOCAL5',
'local6' => 'LOG_LOCAL6',
'local7' => 'LOG_LOCAL7',
'lpr' => 'LOG_LPR',
'mail' => 'LOG_MAIL',
'news' => 'LOG_NEWS',
'syslog' => 'LOG_SYSLOG',
'user' => 'LOG_USER',
'uucp' => 'LOG_UUCP'
'local7' => 'LOG_LOCAL7'
)
)
);

14
library/Icinga/Application/Logger/Writer/SyslogWriter.php
View File

@ -33,11 +33,7 @@ class SyslogWriter extends LogWriter
* @var array
*/
public static $facilities = array(
'auth' => LOG_AUTH,
'authpriv' => LOG_AUTHPRIV,
'cron' => LOG_CRON,
'daemon' => LOG_DAEMON,
'kern' => LOG_KERN,
'user' => LOG_USER,
'local0' => LOG_LOCAL0,
'local1' => LOG_LOCAL1,
'local2' => LOG_LOCAL2,
@ -45,13 +41,7 @@ class SyslogWriter extends LogWriter
'local4' => LOG_LOCAL4,
'local5' => LOG_LOCAL5,
'local6' => LOG_LOCAL6,
'local7' => LOG_LOCAL7,
'lpr' => LOG_LPR,
'mail' => LOG_MAIL,
'news' => LOG_NEWS,
'syslog' => LOG_SYSLOG,
'user' => LOG_USER,
'uucp' => LOG_UUCP
'local7' => LOG_LOCAL7
);
/**