PhpWriter: replace newlines in the message only if PHP logs to Syslog

refs #11652
2016-11-03 14:06:02 +01:00 · 2016-11-03 14:06:02 +01:00 · a85d259b0a
parent 4689f224b5
commit a85d259b0a
1 changed files with 3 additions and 3 deletions
--- a/library/Icinga/Application/Logger/Writer/PhpWriter.php
+++ b/library/Icinga/Application/Logger/Writer/PhpWriter.php
@ -36,9 +36,9 @@ class PhpWriter extends LogWriter
     */
    public function log($severity, $message)
    {
-        if (! error_log(
-            $this->ident . ': ' . Logger::$levels[$severity] . ' - ' . str_replace("\n", '    ', $message)
-        )) {
+        if (! error_log($this->ident . ': ' . Logger::$levels[$severity] . ' - ' . (
+            ini_get('error_log') === 'syslog' ? str_replace("\n", '    ', $message) : $message
+        ))) {
            throw new NotWritableError('Could not log to ' . (ini_get('error_log') ?: 'SAPI'));
        }
    }