Merge branch '1.2'

* 1.2: fixed CS Update monolog provider for support permissions
silexphp · May 4, 2014 · b0aa888 · b0aa888
2 parents ae8f9d4 + 6fdeeba
commit b0aa888
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/doc/providers/monolog.rst b/doc/providers/monolog.rst
@@ -12,6 +12,8 @@ Parameters
 ----------
 
 * **monolog.logfile**: File where logs are written to.
+* **monolog.bubble** = (optional) Whether the messages that are handled can bubble up the stack or not.
+* **monolog.permission** = (optional) File permissions default (null), nothing change.
 
 * **monolog.level** (optional): Level of logging, defaults
   to ``DEBUG``. Must be one of ``Logger::DEBUG``, ``Logger::INFO``,

diff --git a/src/Silex/Provider/MonologServiceProvider.php b/src/Silex/Provider/MonologServiceProvider.php
@@ -61,7 +61,7 @@ public function register(Container $app)
         $app['monolog.handler'] = function () use ($app) {
             $level = MonologServiceProvider::translateLevel($app['monolog.level']);
 
-            return new StreamHandler($app['monolog.logfile'], $level);
+            return new StreamHandler($app['monolog.logfile'], $level, $app['monolog.bubble'], $app['monolog.permission']);
         };
 
         $app['monolog.level'] = function () {
@@ -73,6 +73,8 @@ public function register(Container $app)
         };
 
         $app['monolog.name'] = 'myapp';
+        $app['monolog.bubble'] = true;
+        $app['monolog.permission'] = null;
     }
 
     public function boot(Application $app)