Merge pull request #74 from Tarpsvo/master

Handle jobs that are not CloudTaskJobs gracefully

Author: marickvantuil

src/CloudTasksServiceProvider.php

@@ -128,15 +128,17 @@ private function registerRoutes(): void
 
     private function registerDashboard(): void
     {
-        app('events')->listen(TaskCreated::class, function (TaskCreated $event) {
+        $events = $this->app['events'];
+
+        $events->listen(TaskCreated::class, function (TaskCreated $event) {
             if (CloudTasks::dashboardDisabled()) {
                 return;
             }
 
             DashboardService::make()->add($event->queue, $event->task);
         });
 
-        app('events')->listen(JobFailed::class, function (JobFailed $event) {
+        $events->listen(JobFailed::class, function (JobFailed $event) {
             if (!$event->job instanceof CloudTasksJob) {
                 return;
             }
@@ -149,52 +151,58 @@ private function registerDashboard(): void
             );
         });
 
-        app('events')->listen(JobProcessing::class, function (JobProcessing $event) {
-            if (!CloudTasks::dashboardEnabled()) {
+        $events->listen(JobProcessing::class, function (JobProcessing $event) {
+            if (!$event->job instanceof CloudTasksJob) {
                 return;
             }
 
-            if ($event->job instanceof CloudTasksJob) {
+            if (CloudTasks::dashboardEnabled()) {
                 DashboardService::make()->markAsRunning($event->job->uuid());
             }
         });
 
-        app('events')->listen(JobProcessed::class, function (JobProcessed $event) {
-            data_set($event->job->job, 'internal.processed', true);
-
-            if (!CloudTasks::dashboardEnabled()) {
+        $events->listen(JobProcessed::class, function (JobProcessed $event) {
+            if (!$event->job instanceof CloudTasksJob) {
                 return;
             }
 
-            if ($event->job instanceof CloudTasksJob) {
+            data_set($event->job->job, 'internal.processed', true);
+
+            if (CloudTasks::dashboardEnabled()) {
                 DashboardService::make()->markAsSuccessful($event->job->uuid());
             }
         });
 
-        app('events')->listen(JobExceptionOccurred::class, function (JobExceptionOccurred $event) {
-            data_set($event->job->job, 'internal.errored', true);
-
-            if (!CloudTasks::dashboardEnabled()) {
+        $events->listen(JobExceptionOccurred::class, function (JobExceptionOccurred $event) {
+            if (!$event->job instanceof CloudTasksJob) {
                 return;
             }
 
-            DashboardService::make()->markAsError($event);
+            data_set($event->job->job, 'internal.errored', true);
+
+            if (CloudTasks::dashboardEnabled()) {
+                DashboardService::make()->markAsError($event);
+            }
         });
 
-        app('events')->listen(JobFailed::class, function ($event) {
-            if (!CloudTasks::dashboardEnabled()) {
+        $events->listen(JobFailed::class, function ($event) {
+            if (!$event->job instanceof CloudTasksJob) {
                 return;
             }
 
-            DashboardService::make()->markAsFailed($event);
+            if (CloudTasks::dashboardEnabled()) {
+                DashboardService::make()->markAsFailed($event);
+            }
         });
 
-        app('events')->listen(JobReleased::class, function (JobReleased $event) {
-            if (!CloudTasks::dashboardEnabled()) {
+        $events->listen(JobReleased::class, function (JobReleased $event) {
+            if (!$event->job instanceof CloudTasksJob) {
                 return;
             }
 
-            DashboardService::make()->markAsReleased($event);
+            if (CloudTasks::dashboardEnabled()) {
+                DashboardService::make()->markAsReleased($event);
+            }
         });
     }
 }