Merge pull request #48 from danielme85/dev

Updates

Author: danielme85

.github/workflows/docker.yml

@@ -1,34 +1,28 @@
-name: TestInDocker
+name: RunPhpUnitInDocker
 
 on:
   push:
     branches:
       - main
+      - dev
   pull_request:
     branches:
       - main
 
 jobs:
-  run-test-image:
-    runs-on: ubuntu:latest
-    timeout-minutes: 5
-    container: ghcr.io/danielme85/lltdb-testbench:latest
+  docker:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
       - name: Start containers
         run: docker-compose up -d mariadb mongo
 
-      - name: Install composer packages
-        run: cd /var/testing && composer install --no-interaction
-
-      - name: Run tests
-        run: cd /var/testing && dockerize -wait tcp://mariadb:3306 -timeout 1m && ./vendor/bin/testbench package:test
-
-      - name: Upload test coverage
-        uses: codecov/codecov-action@v3
-        with:
-          files: ./clover.xml
+      - name: Start test container
+        run: docker-compose up php8
 
       - name: Cleanup containers
         run: docker-compose down
-

docker-compose.yaml

@@ -3,7 +3,7 @@ version: "2.4"
 services:
 
   mariadb:
-    image: mariadb:10.5
+    image: mariadb:latest
     container_name: laravel-log-to-db-mariadb
     networks:
       - laravel-log-to-db-testing
@@ -24,6 +24,7 @@ services:
   php8:
     image: ghcr.io/danielme85/lltdb-testbench
     container_name: laravel-log-to-db-php8
+    tty: true
     build:
       context: ./docker/php8/
       dockerfile: Dockerfile

phpunit.xml

@@ -10,9 +10,6 @@
         <exclude>
             <directory>./vendor</directory>
         </exclude>
-        <report>
-            <clover outputFile="./clover.xml"/>
-        </report>
     </coverage>
     <testsuites>
         <testsuite name="Test Suite danielme85/laravel-log-to-db">

readme.md

@@ -324,6 +324,19 @@ LogToDB::model()->removeOlderThan('2019-01-01 23:00:00');
 
 ## Processors
 Monolog ships with a set of [processors](https://github.com/Seldaek/monolog/tree/master/src/Monolog/Processor), these will generate additional data and populate the 'extra' field.
+I've also added a couple of example processors in this pacage under src/Processors.
+To enable processors you can add them to the log config array:
+```php
+'database' => [
+    'driver' => 'custom',
+    'via' => danielme85\LaravelLogToDB\LogToDbHandler::class
+    ...
+    'processors' => [
+        \danielme85\LaravelLogToDB\Processors\PhpVersionProcessor::class,
+        Monolog\Processor\HostnameProcessor::class,
+    ]
+
+```
 
 You could also create your own custom processor, make sure they implement [Monolog\Processor\ProcessorInterface](https://github.com/Seldaek/monolog/blob/master/src/Monolog/Processor/ProcessorInterface.php).
 
@@ -415,6 +428,8 @@ You also need to make sure that all the needed basic config values for logtodb i
 * or just add all your log-to-db options in your applications config/logging.php file (probably easiest). Just follow the 
 configuration example above under the [configuration](#configuration) section.
 
+Since we are using Lumen we need to specify the config and service providers in the "bootstrap/app.php" file.
+
 ```
 /*
 |--------------------------------------------------------------------------
@@ -452,9 +467,9 @@ Next step is to register the service provider, either in bootstrap/app.php or in
 $app->register(\danielme85\LaravelLogToDB\ServiceProvider::class);
 ```
 
-After adding the service provider you should be able to run the database migration with:
+After adding the service provider you should be able to run the database migration in Lumen with:
 ```
-php artisan migrate
+php artisan migrate --path=vendor/danielme85/laravel-log-to-db/src/migrations/2018_08_11_003343_create_log_table.php
 ```
 Please note that you need a working db connection in Lumen at this point.
 

src/Facades/LogToDB.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace danielme85\LaravelLogToDB\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class LogToDB extends Facade
+{
+    /**
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'laravel-log-to-db';
+    }
+
+}

src/LogToDB.php

@@ -150,7 +150,7 @@ public function newFromMonolog(array $record)
             } else if (!$detailed) {
                 $record['context'] = null;
             }
-            if ($this->config['queue']) {
+            if (!empty($this->config['queue'])) {
                 if (empty($this->config['queue_name']) && empty($this->config['queue_connection'])) {
                     dispatch(new SaveNewLogEvent($this, $record));
                 } else if (!empty($this->config['queue_name']) && !empty($this->config['queue_connection'])) {

src/LogToDbCustomLoggingHandler.php

@@ -25,7 +25,7 @@ class LogToDbCustomLoggingHandler extends AbstractProcessingHandler
     /**
      * LogToDbHandler constructor.
      *
-     * @param array $config Logging configuration from logging.php8
+     * @param array $config Logging configuration from logging.php
      * @param array $processors collection of log processors
      * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
      */

src/ServiceProvider.php

@@ -27,7 +27,8 @@ public function boot()
     {
         //config path is missing in Lumen
         //https://gist.github.com/mabasic/21d13eab12462e596120
-        if (!function_exists('config_path')) {
+        if (!function_exists('config_path') &&
+            !function_exists('danielme85\LaravelLogToDB\config_path')) {
             function config_path($path = '')
             {
                 return app()->basePath() . '/config' . ($path ? '/' . $path : $path);
@@ -37,7 +38,7 @@ function config_path($path = '')
         //Merge config first, then keep a publish option
         $this->mergeConfigFrom(__DIR__.'/config/logtodb.php', 'logtodb');
         $this->publishes([
-            __DIR__.'/config/logtodb.php' => config_path('logtodb.php8'),
+            __DIR__.'/config/logtodb.php' => config_path('logtodb.php'),
         ], 'config');
 
         //Publish the migration

src/config/logtodb.php

@@ -5,7 +5,7 @@
     |--------------------------------------------------------------------------
     |
     |   These settings are ONLY USED if they are not specified per channel
-    |   in the config/logging.php8 file.
+    |   in the config/logging.php file.
     |
     */
 return [
@@ -15,11 +15,11 @@
     |--------------------------------------------------------------------------
     |
     | Set the default database connection to use. This is only used if no connection
-    | is specified in config/logging.php8. Matches connections in the config/database.php8.
+    | is specified in config/logging.php. Matches connections in the config/database.php.
     | The default is: 'default', this will use whatever is default in the Laravel DB
     | config file. To use a different or separate connection set the connection name here.
-    | Ex: 'connection' => 'mysql' wil use the connection 'mysql' in database.php8.
-    | Ex: 'connection' => 'mongodb' wil use the connection 'mongodb' in database.php8*
+    | Ex: 'connection' => 'mysql' wil use the connection 'mysql' in database.php.
+    | Ex: 'connection' => 'mongodb' wil use the connection 'mongodb' in database.php*
     |
     | Supported connections should be same as Laravel since the Laravel DB/Eloquent
     | Supported DB engines as of this writing: [MySQL] [PostgreSQL] [SQLite] [SQL Server]
@@ -89,7 +89,7 @@
     |
     | If you are working with multiple queue connections, you may specify which
     | connection to push a job to.
-    | This relates yto your queue settings in the config/queue.php8 file.
+    | This relates yto your queue settings in the config/queue.php file.
     | Leave blank to use the default connection.
     |
     */