#6622 Logger refactoring: cleared up formatting that was left in FileHandler

This is so the FileHandler can be replaced by Monolog's StreamHandler

core/Log/Formatter/LineMessageFormatter.php

@@ -9,7 +9,7 @@
 namespace Piwik\Log\Formatter;
 
 /**
- * Formats a log message into a single line of text.
+ * Formats a log message into a line of text.
  */
 class LineMessageFormatter extends Formatter
 {
@@ -39,6 +39,8 @@ class LineMessageFormatter extends Formatter
             $this->logMessageFormat
         );
 
+        $message = str_replace("\n", "\n  ", $message);
+
         $message .= "\n";
 
         return $message;

core/Log/Handler/FileHandler.php

@@ -33,13 +33,12 @@ class FileHandler extends AbstractProcessingHandler
 
     protected function write(array $record)
     {
-        $message = str_replace("\n", "\n  ", trim($record['formatted'])) . "\n";
-
-        if (!@file_put_contents($this->logToFilePath, $message, FILE_APPEND)
+        if (!@file_put_contents($this->logToFilePath, $record['formatted'], FILE_APPEND)
             && !defined('PIWIK_TEST_MODE')
         ) {
-            $message = Filechecks::getErrorMessageMissingPermissions($this->logToFilePath);
-            throw new \Exception($message);
+            throw new \Exception(
+                Filechecks::getErrorMessageMissingPermissions($this->logToFilePath)
+            );
         }
     }
 }

tests/PHPUnit/Integration/LogTest.php

@@ -42,7 +42,7 @@ dummy backtrace</div></div>',
         'file' => '[Piwik\Tests\Integration\LogTest] LogTest.php(174): dummy error message
   dummy backtrace',
         'database' => '[Piwik\Tests\Integration\LogTest] LogTest.php(174): dummy error message
-dummy backtrace'
+  dummy backtrace'
     );
 
     public static $expectedErrorOutput = array(
@@ -55,7 +55,7 @@ dummy backtrace</div></div>',
         'file' => '[Piwik\Tests\Integration\LogTest] dummyerrorfile.php(145): Unknown error (102) - dummy error string
   dummy backtrace',
         'database' => '[Piwik\Tests\Integration\LogTest] dummyerrorfile.php(145): Unknown error (102) - dummy error string
-dummy backtrace'
+  dummy backtrace'
     );
 
     private $screenOutput;