Add log service provider, defers loading of logger.

laravel · Sep 24, 2016 · 919f21b · 919f21b
1 parent abc5bb6
commit 919f21b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 38 deletions.
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -9,6 +9,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Log\LogServiceProvider;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Events\EventServiceProvider;
 use Illuminate\Routing\RoutingServiceProvider;
@@ -185,6 +186,8 @@ protected function registerBaseServiceProviders()
         $this->register(new EventServiceProvider($this));
 
         $this->register(new RoutingServiceProvider($this));
+
+        $this->register(new LogServiceProvider($this));
     }
 
     /**

diff --git a/src/Illuminate/Foundation/Console/Kernel.php b/src/Illuminate/Foundation/Console/Kernel.php
@@ -58,7 +58,6 @@ class Kernel implements KernelContract
     protected $bootstrappers = [
         'Illuminate\Foundation\Bootstrap\DetectEnvironment',
         'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-        'Illuminate\Foundation\Bootstrap\ConfigureLogging',
         'Illuminate\Foundation\Bootstrap\HandleExceptions',
         'Illuminate\Foundation\Bootstrap\RegisterFacades',
         'Illuminate\Foundation\Bootstrap\SetRequestForConsole',

diff --git a/src/Illuminate/Foundation/Console/Optimize/config.php b/src/Illuminate/Foundation/Console/Optimize/config.php
@@ -44,7 +44,6 @@
     $basePath.'/vendor/symfony/http-kernel/TerminableInterface.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Application.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php',
-    $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/ConfigureLogging.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterFacades.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/RegisterProviders.php',
@@ -73,6 +72,7 @@
     $basePath.'/vendor/symfony/http-foundation/AcceptHeaderItem.php',
     $basePath.'/vendor/symfony/http-foundation/AcceptHeader.php',
     $basePath.'/vendor/symfony/debug/ExceptionHandler.php',
+    $basePath.'/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Support/AggregateServiceProvider.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php',
@@ -144,19 +144,7 @@
     $basePath.'/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php',
-    $basePath.'/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php',
-    $basePath.'/vendor/laravel/framework/src/Illuminate/Log/Writer.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Logger.php',
-    $basePath.'/vendor/psr/log/Psr/Log/LoggerInterface.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php',
-    $basePath.'/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php',
     $basePath.'/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php',

diff --git a/src/Illuminate/Foundation/Http/Kernel.php b/src/Illuminate/Foundation/Http/Kernel.php
@@ -36,7 +36,6 @@ class Kernel implements KernelContract
     protected $bootstrappers = [
         'Illuminate\Foundation\Bootstrap\DetectEnvironment',
         'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-        'Illuminate\Foundation\Bootstrap\ConfigureLogging',
         'Illuminate\Foundation\Bootstrap\HandleExceptions',
         'Illuminate\Foundation\Bootstrap\RegisterFacades',
         'Illuminate\Foundation\Bootstrap\RegisterProviders',

diff --git a/...Foundation/Bootstrap/ConfigureLogging.php → src/Illuminate/Log/LogServiceProvider.php b/...Foundation/Bootstrap/ConfigureLogging.php → src/Illuminate/Log/LogServiceProvider.php
@@ -1,47 +1,45 @@
 <?php
 
-namespace Illuminate\Foundation\Bootstrap;
+namespace Illuminate\Log;
 
-use Illuminate\Log\Writer;
 use Monolog\Logger as Monolog;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Foundation\Application;
 
-class ConfigureLogging
+class LogServiceProvider extends ServiceProvider
 {
     /**
-     * Bootstrap the given application.
+     * Register the service provider.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @return void
      */
-    public function bootstrap(Application $app)
+    public function register()
     {
-        $log = $this->registerLogger($app);
-
-        // If a custom Monolog configurator has been registered for the application
-        // we will call that, passing Monolog along. Otherwise, we will grab the
-        // the configurations for the log system and use it for configuration.
-        if ($app->hasMonologConfigurator()) {
-            call_user_func(
-                $app->getMonologConfigurator(), $log->getMonolog()
-            );
-        } else {
-            $this->configureHandlers($app, $log);
-        }
+        $this->app->singleton('log', function ($app) {
+            return $this->createLogger($app);
+        });
     }
 
     /**
-     * Register the logger instance in the container.
+     * Create the logger.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @param  \Illuminate\Contracts\Foundation\Application $app
      * @return \Illuminate\Log\Writer
      */
-    protected function registerLogger(Application $app)
+    public function createLogger($app)
     {
-        $app->instance('log', $log = new Writer(
-            new Monolog($app->environment()), $app['events'])
+        $log = new Writer(
+            new Monolog($app->environment()), $app['events']
         );
 
+        if ($app->hasMonologConfigurator()) {
+            call_user_func(
+                $app->getMonologConfigurator(), $log->getMonolog()
+            );
+        } else {
+            $this->configureHandlers($app, $log);
+        }
+
         return $log;
     }