#6622 Logger refactoring: renamed "Backend" to "Handler" to match Mon…

…olog naming
matomo-org · Dec 9, 2014 · 3fd7de5 · 3fd7de5
1 parent aad92e9
commit 3fd7de5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 67 deletions.
diff --git a/config/global.php b/config/global.php
@@ -4,7 +4,7 @@
 use Monolog\Logger;
 use Piwik\Common;
 use Piwik\Log;
-use Piwik\Log\Backend\StdErrBackend;
+use Piwik\Log\Handler\StdErrHandler;
 
 return array(
 
@@ -38,9 +38,9 @@
         }
 
         $classes = array(
-            'file'     => 'Piwik\Log\Backend\FileBackend',
-            'screen'   => 'Piwik\Log\Backend\StdOutBackend',
-            'database' => 'Piwik\Log\Backend\DatabaseBackend',
+            'file'     => 'Piwik\Log\Handler\FileHandler',
+            'screen'   => 'Piwik\Log\Handler\StdOutHandler',
+            'database' => 'Piwik\Log\Handler\DatabaseHandler',
         );
 
         $writerNames = array_map('trim', $writerNames);
@@ -52,9 +52,9 @@
             }
         }
 
-        // Always add the stderr backend
+        // Always add the stderr handler
         $isLoggingToStdOut = isset($writers['screen']);
-        $writers['stderr'] = new StdErrBackend($c->get('Piwik\Log\Formatter\ExceptionHtmlFormatter'), $isLoggingToStdOut);
+        $writers['stderr'] = new StdErrHandler($c->get('Piwik\Log\Formatter\ExceptionHtmlFormatter'), $isLoggingToStdOut);
 
         return array_values($writers);
     }),
@@ -64,13 +64,13 @@
         DI\link('Piwik\Log\Processor\SprintfProcessor'),
         DI\link('Monolog\Processor\PsrLogMessageProcessor'),
     ),
-    'Piwik\Log\Backend\FileBackend' => DI\object()
+    'Piwik\Log\Handler\FileHandler' => DI\object()
         ->constructor(DI\link('log.file.filename'), DI\link('log.level'))
         ->method('setFormatter', DI\link('Piwik\Log\Formatter\ExceptionTextFormatter')),
-    'Piwik\Log\Backend\DatabaseBackend' => DI\object()
+    'Piwik\Log\Handler\DatabaseHandler' => DI\object()
         ->constructor(DI\link('log.level'))
         ->method('setFormatter', DI\link('Piwik\Log\Formatter\ExceptionTextFormatter')),
-    'Piwik\Log\Backend\StdOutBackend' => DI\object()
+    'Piwik\Log\Handler\StdOutHandler' => DI\object()
         ->constructor(DI\link('log.level'))
         ->method('setFormatter', DI\link('Piwik\Log\Formatter\ExceptionHtmlFormatter')),
     'log.level' => DI\factory(function (ContainerInterface $c) {

diff --git a/core/Log/Backend/Backend.php b/core/Log/Backend/Backend.php
diff --git a/core/Log/Backend/DatabaseBackend.php → core/Log/Handler/DatabaseHandler.php b/core/Log/Backend/DatabaseBackend.php → core/Log/Handler/DatabaseHandler.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Log\Backend;
+namespace Piwik\Log\Handler;
 
 use Monolog\Handler\AbstractProcessingHandler;
 use Piwik\Common;
@@ -15,7 +15,7 @@
 /**
  * Writes log to database.
  */
-class DatabaseBackend extends AbstractProcessingHandler
+class DatabaseHandler extends AbstractProcessingHandler
 {
     protected function write(array $record)
     {

diff --git a/core/Log/Backend/FileBackend.php → core/Log/Handler/FileHandler.php b/core/Log/Backend/FileBackend.php → core/Log/Handler/FileHandler.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Log\Backend;
+namespace Piwik\Log\Handler;
 
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
@@ -15,7 +15,7 @@
 /**
  * Writes log to file.
  */
-class FileBackend extends AbstractProcessingHandler
+class FileHandler extends AbstractProcessingHandler
 {
     /**
      * Path to the file to log to.

diff --git a/core/Log/Backend/StdErrBackend.php → core/Log/Handler/StdErrHandler.php b/core/Log/Backend/StdErrBackend.php → core/Log/Handler/StdErrHandler.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Log\Backend;
+namespace Piwik\Log\Handler;
 
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Handler\AbstractProcessingHandler;
@@ -15,7 +15,7 @@
 /**
  * Writes log to stderr.
  */
-class StdErrBackend extends AbstractProcessingHandler
+class StdErrHandler extends AbstractProcessingHandler
 {
     /**
      * @var bool

diff --git a/core/Log/Backend/StdOutBackend.php → core/Log/Handler/StdOutHandler.php b/core/Log/Backend/StdOutBackend.php → core/Log/Handler/StdOutHandler.php
@@ -6,14 +6,14 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Log\Backend;
+namespace Piwik\Log\Handler;
 
 use Monolog\Handler\AbstractProcessingHandler;
 
 /**
  * Writes log to stdout.
  */
-class StdOutBackend extends AbstractProcessingHandler
+class StdOutHandler extends AbstractProcessingHandler
 {
     protected function write(array $record)
     {