pref: 支持可配置 LogEnum

Author: jiannei

.github/workflows/test.yml

@@ -25,11 +25,13 @@ jobs:
         uses: actions/cache@v2
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-php-
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
-        run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs
+        run: |
+            composer require --dev "jiannei/laravel-enum" --no-interaction --no-update
+            composer update --prefer-dist --no-interaction
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         run: vendor/bin/phpunit

composer.json

@@ -9,12 +9,12 @@
         }
     ],
     "require": {
-        "ext-json": "*",
-        "jiannei/laravel-enum": "^1.0"
+        "ext-json": "*"
     },
     "require-dev": {
         "orchestra/testbench": "^6.4",
-        "phpunit/phpunit": "^9.4"
+        "phpunit/phpunit": "^9.4",
+        "jiannei/laravel-enum": "^1.2"
     },
     "autoload": {
         "files": [

config/logging.php

@@ -27,6 +27,8 @@
         ],
     ],
 
+    'enum' => \Jiannei\Enum\Laravel\Repositories\Enums\LogEnum::class,
+
     'query' => [
         'enabled' => env('LOG_QUERY', false),
 

src/Listeners/RequestHandledListener.php

@@ -11,8 +11,8 @@
 
 namespace Jiannei\Logger\Laravel\Listeners;
 
+use Illuminate\Support\Facades\Config;
 use Jiannei\Logger\Laravel\Events\RequestHandledEvent;
-use Jiannei\Logger\Laravel\Repositories\Enums\LogEnum;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
 class RequestHandledListener
@@ -32,6 +32,14 @@ public function handle(RequestHandledEvent $event)
             'duration' => formatDuration($end - $start),
         ];
 
-        logger_async(LogEnum::REQUEST, $context);
+        /**
+         * @var \Jiannei\Enum\Laravel\Repositories\Enums\LogEnum $logEnumClass
+         */
+        $message = 'system:request';
+        if (class_exists($logEnumClass = Config::get('logging.enum'))) {
+            $message = $logEnumClass::getDescription($logEnumClass::SYSTEM_REQUEST);
+        }
+
+        logger_async($message, $context);
     }
 }

src/Providers/ServiceProvider.php

@@ -18,7 +18,6 @@
 use Jiannei\Logger\Laravel\Events\RequestHandledEvent;
 use Jiannei\Logger\Laravel\Listeners\RequestArrivedListener;
 use Jiannei\Logger\Laravel\Listeners\RequestHandledListener;
-use Jiannei\Logger\Laravel\Repositories\Enums\LogEnum;
 
 class ServiceProvider extends IlluminateServiceProvider
 {
@@ -56,7 +55,15 @@ protected function logQuery()
                 'sql' => $realSql,
             ];
 
-            logger_async(LogEnum::SQL, $context);
+            /**
+             * @var \Jiannei\Enum\Laravel\Repositories\Enums\LogEnum $logEnumClass
+             */
+            $message = 'system:sql';
+            if (class_exists($logEnumClass = $this->app['config']->get('logging.enum'))) {
+                $message = $logEnumClass::getDescription($logEnumClass::SYSTEM_SQL);
+            }
+
+            logger_async($message, $context);
         });
     }