diff --git a/src/Prettus/RequestLogger/Logger.php b/src/Prettus/RequestLogger/Logger.php index 72781cb..c779faf 100644 --- a/src/Prettus/RequestLogger/Logger.php +++ b/src/Prettus/RequestLogger/Logger.php @@ -2,7 +2,7 @@ namespace Prettus\RequestLogger; -use Illuminate\Contracts\Logging\Log; +use Psr\Log\LoggerInterface as Log; /** * Class Logger @@ -22,7 +22,7 @@ class Logger implements Log */ public function __construct() { - $this->monolog = clone app('log')->getMonolog(); + $this->monolog = \Illuminate\Support\Facades\Log::getLogger(); if( config('request-logger.logger.enabled') && $handlers = config('request-logger.logger.handlers') ) { if( count($handlers) ) { @@ -40,6 +40,19 @@ public function __construct() } } + /** + * System is unusable. + * + * @param string $message + * @param array $context + * + * @return void + */ + public function emergency($message, array $context = array()) + { + $this->monolog->emergency($message, $context); + } + /** * Log an alert message to the logs. * diff --git a/src/Prettus/RequestLogger/Providers/LoggerServiceProvider.php b/src/Prettus/RequestLogger/Providers/LoggerServiceProvider.php index 7a24d31..287653e 100644 --- a/src/Prettus/RequestLogger/Providers/LoggerServiceProvider.php +++ b/src/Prettus/RequestLogger/Providers/LoggerServiceProvider.php @@ -9,6 +9,7 @@ use Prettus\RequestLogger\Jobs\Compatibility\LogTask51; use Prettus\RequestLogger\Jobs\Compatibility\LogTask53; use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Foundation\Http\Events\RequestHandled; /** * Class LoggerServiceProvider @@ -44,21 +45,20 @@ public function register() { Benchmarking::start('application'); - $this->app['events']->listen('kernel.handled', function ($request, $response) { - + $this->app['events']->listen(RequestHandled::class, function ($event) { Benchmarking::end('application'); - if(!$this->excluded($request)) { + if(!$this->excluded($event->request)) { if( version_compare($this->app->version(), "5.2.99", "<=")) { //Compatible with Laravel 5.1 and 5.2 - $task = new LogTask51($request, $response); + $task = new LogTask51($event->request, $event->response); }else if( version_compare($this->app->version(), "5.3.99", "<=") ){ //Compatible with Laravel 5.3 - $task = new LogTask53($request, $response); + $task = new LogTask53($event->request, $event->response); }else{ //Compatible with Laravel 5.4 or later - $task = new LogTask($request, $response); + $task = new LogTask($event->request, $event->response); } if($queueName = config('request-logger.queue')) { @@ -68,6 +68,7 @@ public function register() } } }); + } protected function excluded(Request $request) { diff --git a/src/Prettus/RequestLogger/ResponseLogger.php b/src/Prettus/RequestLogger/ResponseLogger.php index c3cdf34..191b786 100644 --- a/src/Prettus/RequestLogger/ResponseLogger.php +++ b/src/Prettus/RequestLogger/ResponseLogger.php @@ -6,6 +6,7 @@ use Symfony\Component\HttpFoundation\Response; use Prettus\RequestLogger\Helpers\RequestInterpolation; use Prettus\RequestLogger\Helpers\ResponseInterpolation; +use Prettus\RequestLogger\Logger; /** * Class Logger