From 4980631d3bc8f1e29dafadf8a1f4cd525923505e Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 12:49:49 -0600 Subject: [PATCH 1/7] update --- README.md | 6 ++++++ src/ServiceProvider.php | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 641aedb..c13eda0 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ Laravel Query Logger will be enabled when `APP_DEBUG` is `true`. > Please keep the `--dev` option. +Publish configuration file (optional) to select the size in seconds minimum to log. + +``` +php artisan vendor:publish --provider="Overtrue\LaravelQueryLogger\ServiceProvider" +``` + ## Usage ```shell diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 7931e3f..7b408c9 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -23,6 +23,16 @@ class ServiceProvider extends LaravelServiceProvider */ public function boot() { + // Config files + $this->publishes([realpath(__DIR__) . '/config/query-logger.php' => config_path('query-logger.php')], 'config'); + $this->mergeConfigFrom(realpath(__DIR__) . '/config/query-logger.php', 'query-logger'); + + // Disable if config is false + if(config('query-logger.enabled', true)==false) { + return; + } + + // Start code if (!$this->app['config']->get('app.debug')) { return; } @@ -33,9 +43,14 @@ public function boot() $bindings = $query->connection->prepareBindings($query->bindings); $pdo = $query->connection->getPdo(); $realSql = vsprintf($sqlWithPlaceholders, array_map([$pdo, 'quote'], $bindings)); - $duration = $this->formatDuration($query->time / 1000); + $max_miliseconds = config('query-logger.miliseconds', 0); + $seconds = $query->time / 1000; + $duration = $this->formatDuration($seconds); + $miliseconds = $seconds * 1000; - Log::debug(sprintf('[%s] %s | %s: %s', $duration, $realSql, request()->method(), request()->getRequestUri())); + if ($miliseconds >= $max_miliseconds) { + Log::debug(sprintf('[%s] %s | %s: %s', $duration, $realSql, request()->method(), request()->getRequestUri())); + } }); } From f9572713caa3e76047346c8bfe2ad359ce00a1ae Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 12:54:47 -0600 Subject: [PATCH 2/7] follow the standards --- src/ServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 7b408c9..fac8ed7 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -28,7 +28,7 @@ public function boot() $this->mergeConfigFrom(realpath(__DIR__) . '/config/query-logger.php', 'query-logger'); // Disable if config is false - if(config('query-logger.enabled', true)==false) { + if (config('query-logger.enabled', true) == false) { return; } From 680be388bca57901c8ebbcc6b2e2919e2c0d4069 Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 12:59:25 -0600 Subject: [PATCH 3/7] add config file --- src/config/query-logger.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/config/query-logger.php diff --git a/src/config/query-logger.php b/src/config/query-logger.php new file mode 100644 index 0000000..e5ee4f4 --- /dev/null +++ b/src/config/query-logger.php @@ -0,0 +1,13 @@ + env('QUERY_LOGGER_ENABLED', true), + + /* + * Min size of query to log in miliseconds + */ + + 'miliseconds' => 0, + +]; From 18dac6da2e7eaefd33a14539732b3725f5b7da96 Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 13:23:12 -0600 Subject: [PATCH 4/7] improve code --- src/ServiceProvider.php | 6 +++--- src/config/query-logger.php | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index fac8ed7..59d6ba2 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -24,11 +24,11 @@ class ServiceProvider extends LaravelServiceProvider public function boot() { // Config files - $this->publishes([realpath(__DIR__) . '/config/query-logger.php' => config_path('query-logger.php')], 'config'); - $this->mergeConfigFrom(realpath(__DIR__) . '/config/query-logger.php', 'query-logger'); + $this->publishes([realpath(__DIR__).'/config/query-logger.php' => config_path('query-logger.php')], 'config'); ++ $this->mergeConfigFrom(realpath(__DIR__).'/config/query-logger.php', 'query-logger'); // Disable if config is false - if (config('query-logger.enabled', true) == false) { + if (false === config('query-logger.enabled', true)) { return; } diff --git a/src/config/query-logger.php b/src/config/query-logger.php index e5ee4f4..6270c2f 100644 --- a/src/config/query-logger.php +++ b/src/config/query-logger.php @@ -2,12 +2,16 @@ return [ - 'enabled' => env('QUERY_LOGGER_ENABLED', true), + /* + * Enable or disable + */ + + 'enabled' => env('QUERY_LOGGER_ENABLED', true), /* * Min size of query to log in miliseconds */ 'miliseconds' => 0, - + ]; From 2abf30b1d86f4691402da15f071b674e031a6361 Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 13:28:30 -0600 Subject: [PATCH 5/7] fix errors --- src/ServiceProvider.php | 2 +- src/config/query-logger.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index 59d6ba2..d39e446 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -25,7 +25,7 @@ public function boot() { // Config files $this->publishes([realpath(__DIR__).'/config/query-logger.php' => config_path('query-logger.php')], 'config'); -+ $this->mergeConfigFrom(realpath(__DIR__).'/config/query-logger.php', 'query-logger'); + $this->mergeConfigFrom(realpath(__DIR__).'/config/query-logger.php', 'query-logger'); // Disable if config is false if (false === config('query-logger.enabled', true)) { diff --git a/src/config/query-logger.php b/src/config/query-logger.php index 6270c2f..7ac207c 100644 --- a/src/config/query-logger.php +++ b/src/config/query-logger.php @@ -1,5 +1,14 @@ + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + return [ /* From 285d07a94ed7e669fd76620a8dc345404049e5ce Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 13:31:11 -0600 Subject: [PATCH 6/7] remove tab --- src/config/query-logger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/query-logger.php b/src/config/query-logger.php index 7ac207c..9e6b68a 100644 --- a/src/config/query-logger.php +++ b/src/config/query-logger.php @@ -11,7 +11,7 @@ return [ - /* + /* * Enable or disable */ From ef96867ff19f8ca69c861ba110acaee6a8347d3c Mon Sep 17 00:00:00 2001 From: Carlos Escobar Date: Tue, 4 Feb 2020 13:32:05 -0600 Subject: [PATCH 7/7] remove spaces --- src/config/query-logger.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/config/query-logger.php b/src/config/query-logger.php index 9e6b68a..2876de8 100644 --- a/src/config/query-logger.php +++ b/src/config/query-logger.php @@ -10,7 +10,6 @@ */ return [ - /* * Enable or disable */ @@ -22,5 +21,4 @@ */ 'miliseconds' => 0, - ];