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

Merge pull request #2740 from Icinga/feature/emit-log-messages-in-the-webserver-s-log-11652 

Emit log messages to the web server log
This commit is contained in:
lippserd 2017-09-08 15:43:31 +02:00 committed by GitHub
parent ade0744701 707f0435a2
commit 0e5313d4d1
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ class LoggingConfigForm extends Form
'label' => $this->translate('Logging Type'),
'description' => $this->translate('The type of logging to utilize.'),
'multiOptions' => array(
'php' => $this->translate('Webserver Log', 'app.config.logging.type'),
'syslog' => 'Syslog',
'file' => $this->translate('File', 'app.config.logging.type'),
'none' => $this->translate('None', 'app.config.logging.type')
@ -64,7 +65,7 @@ class LoggingConfigForm extends Form
);
}
if (false === isset($formData['logging_log']) || $formData['logging_log'] === 'syslog') {
if (false === isset($formData['logging_log']) || in_array($formData['logging_log'], array('syslog', 'php'))) {
$this->addElement(
'text',
'logging_application',
@ -72,7 +73,7 @@ class LoggingConfigForm extends Form
'required' => true,
'label' => $this->translate('Application Prefix'),
'description' => $this->translate(
'The name of the application by which to prefix syslog messages.'
'The name of the application by which to prefix log messages.'
),
'requirement' => $this->translate('The application prefix must not contain whitespace.'),
'value' => 'icingaweb2',

39
library/Icinga/Application/Logger/Writer/PhpWriter.php Normal file
View File

@ -0,0 +1,39 @@
<?php
/* Icinga Web 2 | (c) 2016 Icinga Development Team | GPLv2+ */
namespace Icinga\Application\Logger\Writer;
use Icinga\Application\Logger;
use Icinga\Application\Logger\LogWriter;
use Icinga\Data\ConfigObject;
use Icinga\Exception\NotWritableError;
/**
* Log to the webserver log, a file or syslog
*
* @see https://secure.php.net/manual/en/errorfunc.configuration.php#ini.error-log
*/
class PhpWriter extends LogWriter
{
/**
* Prefix to prepend to each message
*
* @var string
*/
protected $ident;
public function __construct(ConfigObject $config)
{
parent::__construct($config);
$this->ident = $config->get('application', 'icingaweb2');
}
public function log($severity, $message)
{
if (ini_get('error_log') === 'syslog') {
$message = str_replace("\n", ' ', $message);
}
error_log($this->ident . ': ' . Logger::$levels[$severity] . ' - ' . $message);
}
}