Skip to content

Laravel 5.7 compatible #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/Prettus/RequestLogger/Logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Prettus\RequestLogger;

use Illuminate\Contracts\Logging\Log;
use Psr\Log\LoggerInterface as Log;

/**
* Class Logger
Expand All @@ -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) ) {
Expand All @@ -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.
*
Expand Down
13 changes: 7 additions & 6 deletions src/Prettus/RequestLogger/Providers/LoggerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')) {
Expand All @@ -68,6 +68,7 @@ public function register()
}
}
});

}

protected function excluded(Request $request) {
Expand Down
1 change: 1 addition & 0 deletions src/Prettus/RequestLogger/ResponseLogger.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down