Merge pull request #7 from LExpress/logger

Replace logger injection in the service container by a specify logger

Author: jeromemacias

lib/autoload/sfCoreAutoload.class.php

@@ -327,6 +327,7 @@ static public function make()
     'sfnumberformatinfo' => 'i18n/sfNumberFormatInfo.class.php',
     'sfaggregatelogger' => 'log/sfAggregateLogger.class.php',
     'sfconsolelogger' => 'log/sfConsoleLogger.class.php',
+    'sfeventlogger' => 'log/sfEventLogger.class.php',
     'sffilelogger' => 'log/sfFileLogger.class.php',
     'sflogger' => 'log/sfLogger.class.php',
     'sfloggerinterface' => 'log/sfLoggerInterface.class.php',

lib/config/config/services.yml

@@ -2,9 +2,16 @@
 #   sf_event_dispatcher
 #   sf_formatter
 #   sf_filesystem
+#   sf_logger
 #
 all:
   services:
+
+    sf_logger:
+      class: sfEventLogger
+      arguments:
+        - '@sf_event_dispatcher'
+
     sf_filesystem:
       class: sfFilesystem
       arguments:

lib/log/sfEventLogger.class.php

@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * sfEventLogger sends log messages to the event dispatcher to be processed
+ * by registered loggers.
+ *
+ * @package    symfony
+ * @subpackage log
+ * @author     Jérôme Tamarelle <jtamarelle@groupe-exp.com>
+ */
+class sfEventLogger extends sfLogger
+{
+  /**
+   * {@inheritDoc}
+   */
+  public function initialize(sfEventDispatcher $dispatcher, $options = array())
+  {
+    $this->dispatcher = $dispatcher;
+    $this->options = $options;
+
+    if (isset($this->options['level']))
+    {
+      $this->setLogLevel($this->options['level']);
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  protected function doLog($message, $priority)
+  {
+    $this->dispatcher->notify(new sfEvent($this, 'command.log', array($message)));
+  }
+}

lib/task/sfCommandApplicationTask.class.php

@@ -197,7 +197,6 @@ protected function getServiceContainer()
       $this->serviceContainer = new $class();
       $this->serviceContainer->setService('sf_event_dispatcher', $this->dispatcher);
       $this->serviceContainer->setService('sf_formatter', $this->formatter);
-      $this->serviceContainer->setService('sf_logger', new sfCommandLogger($this->dispatcher));
     }
 
     return $this->serviceContainer;

lib/util/sfContext.class.php

@@ -449,7 +449,6 @@ public function getServiceContainer()
       $this->factories['serviceContainer'] = new $this->serviceContainerConfiguration['class']();
       $this->factories['serviceContainer']->setService('sf_event_dispatcher', $this->configuration->getEventDispatcher());
       $this->factories['serviceContainer']->setService('sf_formatter', new sfFormatter());
-      $this->factories['serviceContainer']->setService('sf_logger', $this->getLogger());
     }
 
     return $this->factories['serviceContainer'];