wip

Author: romanzipp

README.md

@@ -56,9 +56,11 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+
 use romanzipp\QueueMonitor\Traits\IsMonitored; // <---
+use romanzipp\QueueMonitor\Contracts\MonitoredJobContract; // <---
 
-class ExampleJob implements ShouldQueue
+class ExampleJob implements ShouldQueue, MonitoredJobContract
 {
     use Dispatchable;
     use InteractsWithQueue;

src/Providers/QueueMonitorProvider.php

@@ -95,6 +95,26 @@ public function boot(): void
         $queueManager->exceptionOccurred(static function (QueueEvents\JobExceptionOccurred $event) {
             QueueMonitor::handleJobExceptionOccurred($event);
         });
+
+
+        $this->app['events']->listen([
+            QueueEvents\JobExceptionOccurred::class,
+            QueueEvents\JobFailed::class,
+            QueueEvents\JobPopped::class,
+            QueueEvents\JobPopping::class,
+            QueueEvents\JobProcessed::class,
+            QueueEvents\JobProcessing::class,
+            QueueEvents\JobQueued::class,
+            QueueEvents\JobQueueing::class,
+            QueueEvents\JobReleasedAfterException::class,
+            QueueEvents\JobRetryRequested::class,
+            QueueEvents\JobTimedOut::class,
+            QueueEvents\Looping::class,
+            QueueEvents\QueueBusy::class,
+            QueueEvents\WorkerStopping::class,
+        ], function ($event) {
+            #dump(get_class($event));
+        });
     }
 
     /**

src/Services/QueueMonitor.php

@@ -5,19 +5,15 @@
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Queue\Job as JobContract;
-use Illuminate\Queue\Events\JobExceptionOccurred;
-use Illuminate\Queue\Events\JobFailed;
-use Illuminate\Queue\Events\JobProcessed;
-use Illuminate\Queue\Events\JobProcessing;
-use Illuminate\Queue\Events\JobQueued;
+use Illuminate\Queue\Events as QueueEvents;
 use Illuminate\Support\Carbon;
 use romanzipp\QueueMonitor\Enums\MonitorStatus;
 use romanzipp\QueueMonitor\Models\Contracts\MonitorContract;
 use romanzipp\QueueMonitor\Traits\IsMonitored;
 
 class QueueMonitor
 {
-    private const TIMESTAMP_EXACT_FORMAT = 'Y-m-d H:i:s.u';
+    private const string TIMESTAMP_EXACT_FORMAT = 'Y-m-d H:i:s.u';
 
     public static string $model;
 
@@ -31,14 +27,7 @@ public static function getModel(): MonitorContract
         return new self::$model();
     }
 
-    /**
-     * Handle Job Queued.
-     *
-     * @param JobQueued $event
-     *
-     * @return void
-     */
-    public static function handleJobQueued(JobQueued $event): void
+    public static function handleJobQueued(QueueEvents\JobQueued $event): void
     {
         self::jobQueued($event);
     }
@@ -53,50 +42,22 @@ public static function handleJobPushed($event): void
         self::jobPushed($event);
     }
 
-    /**
-     * Handle Job Processing.
-     *
-     * @param JobProcessing $event
-     *
-     * @return void
-     */
-    public static function handleJobProcessing(JobProcessing $event): void
+    public static function handleJobProcessing(QueueEvents\JobProcessing $event): void
     {
         self::jobStarted($event->job);
     }
 
-    /**
-     * Handle Job Processed.
-     *
-     * @param JobProcessed $event
-     *
-     * @return void
-     */
-    public static function handleJobProcessed(JobProcessed $event): void
+    public static function handleJobProcessed(QueueEvents\JobProcessed $event): void
     {
         self::jobFinished($event->job, MonitorStatus::SUCCEEDED);
     }
 
-    /**
-     * Handle Job Failing.
-     *
-     * @param JobFailed $event
-     *
-     * @return void
-     */
-    public static function handleJobFailed(JobFailed $event): void
+    public static function handleJobFailed(QueueEvents\JobFailed $event): void
     {
         self::jobFinished($event->job, MonitorStatus::FAILED, $event->exception);
     }
 
-    /**
-     * Handle Job Exception Occurred.
-     *
-     * @param JobExceptionOccurred $event
-     *
-     * @return void
-     */
-    public static function handleJobExceptionOccurred(JobExceptionOccurred $event): void
+    public static function handleJobExceptionOccurred(QueueEvents\JobExceptionOccurred $event): void
     {
         self::jobFinished($event->job, MonitorStatus::FAILED, $event->exception);
     }
@@ -120,11 +81,11 @@ public static function getJobId(JobContract $job): string
     /**
      * Start Queue Monitoring for Job.
      *
-     * @param JobQueued $event
+     * @param QueueEvents\JobQueued $event
      *
      * @return void
      */
-    protected static function jobQueued(JobQueued $event): void
+    protected static function jobQueued(QueueEvents\JobQueued $event): void
     {
         if ( ! self::shouldBeMonitored($event->job)) {
             return;

src/Traits/IsMonitored.php

@@ -22,7 +22,7 @@ trait IsMonitored
      *
      * @var int
      */
-    private ?int $progressCurrentChunk = 0;
+    private int $progressCurrentChunk = 0;
 
     /**
      * Update progress.