From 00af3d61b7728a5bb4f8e1525bd76341bfd94ffa Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 24 Oct 2016 10:43:27 +0200 Subject: [PATCH] LoggingConfigForm: provide less Syslog facilities refs #11214 --- .../forms/Config/General/LoggingConfigForm.php | 14 ++------------ .../Application/Logger/Writer/SyslogWriter.php | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php index cf2228f7c..428e5a75e 100644 --- a/application/forms/Config/General/LoggingConfigForm.php +++ b/application/forms/Config/General/LoggingConfigForm.php @@ -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' ) ) ); diff --git a/library/Icinga/Application/Logger/Writer/SyslogWriter.php b/library/Icinga/Application/Logger/Writer/SyslogWriter.php index f26a07412..93efc2a19 100644 --- a/library/Icinga/Application/Logger/Writer/SyslogWriter.php +++ b/library/Icinga/Application/Logger/Writer/SyslogWriter.php @@ -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 ); /**