Merge pull request enlitepro#3 from simon-barton/master

Adding processors and moving default monolog service config
abacaphiliac · Feb 28, 2014 · 18ec518 · 18ec518
2 parents 2d1acfc + 6d3849a
commit 18ec518
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 19 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -1,24 +1,6 @@
 <?php
 
 return array(
-    'EnliteMonolog' => array(
-        // Logger name
-        'EnliteMonologService' => array(
-            // name of
-            'name' => 'default',
-            // Handlers, it can be service manager alias(string) or config(array)
-            'handlers' => array(
-                'default' => array(
-                    'name' => 'Monolog\Handler\StreamHandler',
-                    'args' => array(
-                        'path' => 'data/log/application.log',
-                        'level' => \Monolog\Logger::DEBUG,
-                        'bubble' => true
-                    )
-                )
-            )
-        )
-    ),
     'service_manager' => array(
         'abstract_factories' => array(
             'EnliteMonolog\Service\MonologServiceAbstractFactory'
@@ -27,4 +9,4 @@
             'EnliteMonolog\Service\MonologServiceInitializer'
         )
     )
-);
+);
diff --git a/config/monolog.global.php.dist b/config/monolog.global.php.dist
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'EnliteMonolog' => array(
+        // Logger name
+        'EnliteMonologService' => array(
+            // name of
+            'name' => 'default',
+            // Handlers, it can be service manager alias(string) or config(array)
+            'handlers' => array(
+                'default' => array(
+                    'name' => 'Monolog\Handler\StreamHandler',
+                    'args' => array(
+                        'path' => 'data/log/application.log',
+                        'level' => \Monolog\Logger::DEBUG,
+                        'bubble' => true
+                    )
+                )
+            )
+        )
+    )
+);
diff --git a/src/EnliteMonolog/Service/MonologOptions.php b/src/EnliteMonolog/Service/MonologOptions.php
@@ -25,6 +25,11 @@ class MonologOptions extends AbstractOptions
      */
     protected $handlers = array();
 
+    /**
+     * @var array
+     */
+    protected $processors = array();
+
     /**
      * @param string $name
      */
@@ -57,6 +62,20 @@ public function getHandlers()
         return $this->handlers;
     }
 
+    /**
+     * @param array $processors
+     */
+    public function setProcessors($processors = array())
+    {
+        $this->processors = $processors;
+    }
 
+    /**
+     * @return array
+     */
+    public function getProcessors()
+    {
+        return $this->processors;
+    }
 
 }
diff --git a/src/EnliteMonolog/Service/MonologServiceFactory.php b/src/EnliteMonolog/Service/MonologServiceFactory.php
@@ -6,6 +6,7 @@
 namespace EnliteMonolog\Service;
 
 
+use Closure;
 use Monolog\Logger;
 use Monolog\Formatter\FormatterInterface;
 use RuntimeException;
@@ -40,6 +41,10 @@ public function createLogger(ServiceLocatorInterface $serviceLocator, MonologOpt
             $logger->pushHandler($this->createHandler($serviceLocator, $handler));
         }
 
+        foreach ($options->getProcessors() as $processor) {
+            $logger->pushProcessor($this->createProcessor($serviceLocator, $processor));
+        }
+
         return $logger;
     }
 
@@ -121,4 +126,28 @@ public function createFormatter(ServiceLocatorInterface $serviceLocator, $format
 			return new $class();
 		}
 	}
+
+    /**
+     * @param ServiceLocatorInterface $serviceLocator
+     * @param $processor
+     * @return Closure
+     *
+     * @throws RuntimeException
+     */
+    public function createProcessor(ServiceLocatorInterface $serviceLocator, $processor)
+    {
+        if ($processor instanceof Closure) {
+            return $processor;
+        }
+
+        if (is_string($processor)) {
+            $processor = new $processor();
+
+            if (is_callable($processor)) {
+                return $processor;
+            }
+        }
+
+        throw new RuntimeException('Unknown processor type, must be a Closure or the FQCN of an invokable class');
+    }
 }