Commit b0aa888c authored by Fabien Potencier's avatar Fabien Potencier

Merge branch '1.2'

* 1.2:
  fixed CS
  Update monolog provider for support permissions
parents ae8f9d43 6fdeeba8
...@@ -12,6 +12,8 @@ Parameters ...@@ -12,6 +12,8 @@ Parameters
---------- ----------
* **monolog.logfile**: File where logs are written to. * **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 * **monolog.level** (optional): Level of logging, defaults
to ``DEBUG``. Must be one of ``Logger::DEBUG``, ``Logger::INFO``, to ``DEBUG``. Must be one of ``Logger::DEBUG``, ``Logger::INFO``,
......
...@@ -61,7 +61,7 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid ...@@ -61,7 +61,7 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
$app['monolog.handler'] = function () use ($app) { $app['monolog.handler'] = function () use ($app) {
$level = MonologServiceProvider::translateLevel($app['monolog.level']); $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 () { $app['monolog.level'] = function () {
...@@ -73,6 +73,8 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid ...@@ -73,6 +73,8 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
}; };
$app['monolog.name'] = 'myapp'; $app['monolog.name'] = 'myapp';
$app['monolog.bubble'] = true;
$app['monolog.permission'] = null;
} }
public function boot(Application $app) public function boot(Application $app)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment