Add custom LogException that gets ignored by the log itself to avoid log spamming loop.

Some general code cleanup.

Author: danielme85

readme.md

@@ -237,8 +237,8 @@ Then add to your AppServiceProvider (or another provider that calls the app boot
            LogToDB::model()->observe(LogObserver::class);
        }
    }
-``
- 
+```
+
 
 #### Adding tables/expanding collections 
 The Log handler for SQL expects the following schema:

src/Jobs/SaveNewLogEvent.php

@@ -12,7 +12,14 @@ class SaveNewLogEvent implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;
 
+    /**
+     * @var object
+     */
     protected $logToDb;
+
+    /**
+     * @var array
+     */
     protected $record;
 
     /**
@@ -35,10 +42,10 @@ public function __construct($logToDb, $record)
      */
     public function handle()
     {
-        $log = CreateLogFromRecord::generate(
-            $this->logToDb->getModel(),
+        $model = $this->logToDb->getModel();
+        $log = $model->generate(
             $this->record,
-            $this->logToDb->getConfig('detailed') ?? null
+            $this->logToDb->getConfig('detailed')
         );
 
         $log->save();

src/LogToDB.php

@@ -5,7 +5,6 @@
 use danielme85\LaravelLogToDB\Jobs\SaveNewLogEvent;
 use danielme85\LaravelLogToDB\Models\DBLog;
 use danielme85\LaravelLogToDB\Models\DBLogMongoDB;
-use danielme85\LaravelLogToDB\Models\CreateLogFromRecord;
 
 /**
  * Class LogToDb
@@ -32,7 +31,7 @@ class LogToDB
     public $database;
 
     /**
-     * @var
+     * @var string
      */
     protected $model;
 
@@ -175,8 +174,8 @@ public function newFromMonolog(array $record)
                         ->onQueue($this->config['queue_name']);
                 }
             } else {
-                $log = CreateLogFromRecord::generate(
-                    $this->getModel(),
+                $model = $this->getModel();
+                $log = $model->generate(
                     $record,
                     $this->getConfig('detailed')
                 );
@@ -190,6 +189,8 @@ public function newFromMonolog(array $record)
     }
 
     /**
+     * Get config value
+     *
      * @param string $config
      * @return mixed|null
      */

src/LogToDbCustomLoggingHandler.php

@@ -2,6 +2,7 @@
 
 namespace danielme85\LaravelLogToDB;
 
+use danielme85\LaravelLogToDB\Models\DBLogException;
 use Monolog\Handler\AbstractProcessingHandler;
 
 /**
@@ -49,12 +50,24 @@ function __construct(array $config,
      * Write the Log
      *
      * @param array $record
+     * @throws DBLogException
      */
     protected function write(array $record): void
     {
         if (!empty($record)) {
-            $log = new LogToDB($this->config);
-            $log->newFromMonolog($record);
+            if (!empty($record['context']['exception'])
+                && strpos(get_class($record['context']['exception']), "DBLogException")) {
+                //Do nothing if empty log record or an error Exception from itself.
+            } else {
+                try {
+                    $log = new LogToDB($this->config);
+                    $log->newFromMonolog($record);
+                } catch (\Exception $e) {
+                    //convert any runtime Exception while logging to a special class so we can avoid our own
+                    //exceptions for 99% less infinite loops!
+                    throw new DBLogException($e->getMessage());
+                }
+            }
         }
     }
 }

src/Models/CreateLogFromRecord.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace danielme85\LaravelLogToDB\Models;
+
+/**
+ * Class DBLogException
+ * @package danielme85\LaravelLogToDB\Models
+ */
+class DBLogException extends \Exception
+{
+
+}

src/Models/DBLogException.php

@@ -9,6 +9,68 @@
  */
 trait LogToDbCreateObject
 {
+    /**
+     * Create a new log object
+     *
+     * @param array $record
+     * @param bool $detailed
+     *
+     * @return mixed
+     */
+    public function generate(array $record, bool $detailed = false)
+    {
+        if (isset($record['message'])) {
+            $this->message = $record['message'];
+        }
+        if ($detailed) {
+            if (isset($record['context'])) {
+                if (!empty($record['context'])) {
+                    $this->context = $record['context'];
+                }
+            }
+        }
+        if (isset($record['level'])) {
+            $this->level = $record['level'];
+        }
+        if (isset($record['level_name'])) {
+            $this->level_name = $record['level_name'];
+        }
+        if (isset($record['channel'])) {
+            $this->channel = $record['channel'];
+        }
+        if (isset($record['datetime'])) {
+            $this->datetime = $record['datetime'];
+        }
+        if (isset($record['extra'])) {
+            if (!empty($record['extra'])) {
+                $this->extra = $record['extra'];
+            }
+        }
+        $this->unix_time = time();
+
+        return $this;
+    }
+
+    /**
+     * @param $value
+     */
+    public function setMessageAttribute($value)
+    {
+        if (config('logtodb.encrypt')) {
+            $this->attributes['message'] = encrypt($value);
+        } else {
+            $this->attributes['message'] = $value;
+        }
+    }
+
+    public function getMessageAttribute($value)
+    {
+        if (config('logtodb.encrypt')) {
+            return decrypt($value) ?? $value;
+        }
+
+        return $value;
+    }
     /**
      * Context Accessor
      *
@@ -47,37 +109,37 @@ public function setContextAttribute(array $value)
                     if (method_exists($exception, 'getMessage')) {
                         $newexception['message'] = $exception->getMessage();
                     } else {
-                        $newexception['message'] = '';
+                        $newexception['message'] = null;
                     }
                     if (method_exists($exception, 'getCode')) {
                         $newexception['code'] = $exception->getCode();
                     } else {
-                        $newexception['code'] = '';
+                        $newexception['code'] = null;
                     }
                     if (method_exists($exception, 'getFile')) {
                         $newexception['file'] = $exception->getFile();
                     } else {
-                        $newexception['file'] = '';
+                        $newexception['file'] = null;
                     }
                     if (method_exists($exception, 'getLine')) {
                         $newexception['line'] = $exception->getLine();
                     } else {
-                        $newexception['line'] = '';
+                        $newexception['line'] = null;
                     }
                     if (method_exists($exception, 'getTrace')) {
                         $newexception['trace'] = $exception->getTrace();
                     } else {
-                        $newexception['trace'] = '';
+                        $newexception['trace'] = null;
                     }
                     if (method_exists($exception, 'getPrevious')) {
                         $newexception['previous'] = $exception->getPrevious();
                     } else {
-                        $newexception['previous'] = '';
+                        $newexception['previous'] = null;
                     }
                     if (method_exists($exception, 'getSeverity')) {
                         $newexception['severity'] = $exception->getSeverity();
                     } else {
-                        $newexception['severity'] = '';
+                        $newexception['severity'] = null;
                     }
 
                     $value['exception'] = $newexception;

src/Models/LogToDbCreateObject.php

@@ -368,7 +368,7 @@ public function testStandAloneModels()
     public function testCustomModel()
     {
         config()->set('logtodb.model', \danielme85\LaravelLogToDB\Tests\CustomEloquentModel::class);
-        $this->expectException(ErrorException::class);
+        $this->expectException(\danielme85\LaravelLogToDB\Models\DBLogException::class);
         $this->expectExceptionMessage('This is on a custom model class');
         Log::info('This is on a custom model class');
         $this->assertStringContainsString('This is on a custom model class', LogToDB::model()->latest('id')->first()->message);