README.md

@@ -4,14 +4,14 @@
 
 ### 引入
 ```bash
-composer config repositories.php-sql-logger vcs git@git.int.haowumc.com:composer/php-sql-logger.git
+composer config repositories.lumen-sql-logger vcs git@git.int.haowumc.com:arch/lumen-sql-logger.git
-composer require --dev paidian/php-sql-logger:dev-master
+composer require --dev arch/lumen-sql-logger
 ```
 
 ### 开启
 ```php
 if (env('APP_ENV') == 'local') {
-    $app->register(Arch\SQLEventServiceProvider::class);
+    $app->register(Arch\EventServiceProvider::class);
 }
 ```
 

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "paidian/php-sql-logger",
+  "name": "arch/lumen-sql-logger",
   "authors": [
     {
       "name": "候学杰",

src/EventServiceProvider.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Arch;
+
+use Laravel\Lumen\Providers\EventServiceProvider as ServiceProvider;
+
+class EventServiceProvider extends ServiceProvider
+{
+    /**
+     * The event listener mappings for the application.
+     *
+     * @var array
+     */
+    protected $listen = [
+        'Illuminate\Database\Events\QueryExecuted' => [
+            'Arch\Listeners\QueryListener',
+        ]
+    ];
+
+}

src/Listeners/QueryListener.php

@@ -2,9 +2,9 @@
 
 namespace Arch\Listeners;
 
-use Arch\Logging\LogstashFormatter;
 use Illuminate\Database\Events\QueryExecuted;
-use Monolog\Handler\StreamHandler;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 
 class QueryListener
@@ -20,8 +20,9 @@ class QueryListener
     public function __construct()
     {
         $this->logger = new Logger(env('APP_NAME', 'APP_NAME'));
-        $handler = new StreamHandler(storage_path('/logs/sql.log'));
+        $handler = new RotatingFileHandler(storage_path('/logs/sql.log'), 15);
-        $handler->setFormatter(new LogstashFormatter());
+        $formatter = new LineFormatter(null, null, false, true);
+        $handler->setFormatter($formatter);
         $this->logger->pushHandler($handler);
     }
 
@@ -35,8 +36,10 @@ class QueryListener
     {
         if (env('APP_DEBUG')) {
             $sql = str_replace("?", "'%s'", $event->sql);
-            $log = $event->bindings ? vsprintf($sql, $event->bindings) : $sql;
+            $log = vsprintf($sql, $event->bindings);
-            $this->logger->debug($log, ['conn' => $event->connectionName, 'time' => $event->time.'ms']);
+            $requestId = app('request')->header('x-request-id','nginx_config_error');
+            $text = "$requestId\t$log\t";
+            $this->logger->debug($text, ['conn' => $event->connectionName, 'time' => $event->time.'ms']);
         }
     }
 

src/Logging/LogstashFormatter.php

@@ -1,48 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: dongwei
- * Date: 2019/1/10
- * Time: 3:18 PM
- */
-namespace Arch\Logging;
-
-use Monolog\Formatter\NormalizerFormatter;
-
-class LogstashFormatter extends NormalizerFormatter
-{
-    protected $hostname;
-
-    public function __construct()
-    {
-        // logstash requires a ISO 8601 format date with optional millisecond precision.
-        parent::__construct('Y-m-d\TH:i:s.uP');
-
-        $this->hostname = gethostname();
-    }
-
-    public function format(array $record)
-    {
-        $record = parent::format($record);
-        $message = array(
-            '@timestamp' => $record['datetime'],
-            'host' => $this->hostname,
-            'app' => env('APP_NAME'),
-        );
-
-        $request_id = app('request')->header('X-Request-Id');
-        if ($request_id) {
-            $message['request_id'] = $request_id;
-        }
-        if (isset($record['message'])) {
-            $message['sql'] = $record['message'];
-        }
-
-        if (!empty($record['context'])) {
-            $message['conn'] =$record['context']['conn'];
-            $message['time'] =$record['context']['time'];
-        }
-
-        return $this->toJson($message) . "\n";
-    }
-}