From b4b996462bc843c92a3deacd3abed95f67af96f8 Mon Sep 17 00:00:00 2001 From: artemkahramanov Date: Wed, 26 Feb 2025 20:01:04 +0300 Subject: [PATCH 1/2] getting LogToDB instance in SaveNewLogEvent --- src/Jobs/SaveNewLogEvent.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Jobs/SaveNewLogEvent.php b/src/Jobs/SaveNewLogEvent.php index 894f986..2202ada 100644 --- a/src/Jobs/SaveNewLogEvent.php +++ b/src/Jobs/SaveNewLogEvent.php @@ -2,7 +2,6 @@ namespace danielme85\LaravelLogToDB\Jobs; -use danielme85\LaravelLogToDB\Models\DBLogException; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; @@ -15,11 +14,10 @@ class SaveNewLogEvent implements ShouldQueue /** * Create a new job instance. * - * @param object $logToDb * @param \Monolog\LogRecord $record * @return void */ - public function __construct(protected object $logToDb, protected LogRecord $record) + public function __construct(protected LogRecord $record) { } @@ -30,6 +28,6 @@ public function __construct(protected object $logToDb, protected LogRecord $reco */ public function handle() { - $this->logToDb->safeWrite($this->record); + app('laravel-log-to-db')->safeWrite($this->record); } } From 059a51b151320679a502b2f8c058ffa8c16132a4 Mon Sep 17 00:00:00 2001 From: artemkahramanov Date: Mon, 3 Mar 2025 13:15:08 +0300 Subject: [PATCH 2/2] SaveNewLogEvent dispatch fix --- src/LogToDB.php | 8 ++++---- tests/LogToDbTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/LogToDB.php b/src/LogToDB.php index 8706503..a116a1d 100644 --- a/src/LogToDB.php +++ b/src/LogToDB.php @@ -169,16 +169,16 @@ public function newFromMonolog(LogRecord $record) } if (!empty($this->config['queue'])) { if (empty($this->config['queue_name']) && empty($this->config['queue_connection'])) { - dispatch(new SaveNewLogEvent($this, $record)); + dispatch(new SaveNewLogEvent($record)); } else if (!empty($this->config['queue_name']) && !empty($this->config['queue_connection'])) { - dispatch(new SaveNewLogEvent($this, $record)) + dispatch(new SaveNewLogEvent($record)) ->onConnection($this->config['queue_connection']) ->onQueue($this->config['queue_name']); } else if (!empty($this->config['queue_connection'])) { - dispatch(new SaveNewLogEvent($this, $record)) + dispatch(new SaveNewLogEvent($record)) ->onConnection($this->config['queue_connection']); } else if (!empty($this->config['queue_name'])) { - dispatch(new SaveNewLogEvent($this, $record)) + dispatch(new SaveNewLogEvent($record)) ->onQueue($this->config['queue_name']); } } else { diff --git a/tests/LogToDbTest.php b/tests/LogToDbTest.php index 78d705c..56979bc 100644 --- a/tests/LogToDbTest.php +++ b/tests/LogToDbTest.php @@ -332,7 +332,7 @@ public function testSaveNewLogEventJob() formatted: "[2019-10-04T17:26:38.446827+00:00] local.INFO: test [] []\n", ); - $job = new SaveNewLogEvent($logToDb, $record); + $job = new SaveNewLogEvent($record); $job->handle(); $this->assertNotEmpty($logToDb->model()->where('message', '=', 'job-test')->get());