remove logger. check scheduledTaskMonitoringEnabled

appkeep · Dec 19, 2023 · 8224aac · 8224aac
1 parent 47e8c98
commit 8224aac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/src/AppkeepProvider.php b/src/AppkeepProvider.php
@@ -80,23 +80,30 @@ public function bootForConsole()
 
     protected function watchScheduledTasks(Schedule $schedule)
     {
+        /**
+         * @var AppkeepService
+         */
+        $appkeep = app('appkeep');
+
+        if (!$appkeep->scheduledTaskMonitoringEnabled) {
+            return;
+        }
+
         collect($schedule->events())
             ->filter(function ($event) {
-                logger($event->command);
                 // Don't monitor the Appkeep scheduled task itself.
-                return $event->command && ! str_contains($event->command, 'appkeep:run');
+                return $event->command && !str_contains($event->command, 'appkeep:run');
             })
-            ->each(function (Event $event) {
-                /**
-                 * @var AppkeepService
-                 */
-                $appkeep = app('appkeep');
-
+            ->each(function (Event $event) use ($appkeep) {
                 $event->before(fn () => $appkeep->scheduledTaskStarted($event));
 
-                $event->onSuccessWithOutput(fn () => $appkeep->scheduledTaskCompleted($event));
+                $event->onSuccessWithOutput(
+                    fn () => $appkeep->scheduledTaskCompleted($event)
+                );
 
-                $event->onFailureWithOutput(fn () => $appkeep->scheduledTaskFailed($event));
+                $event->onFailureWithOutput(
+                    fn () => $appkeep->scheduledTaskFailed($event)
+                );
             });
     }
 }
diff --git a/src/Concerns/ReportsScheduledTaskOutputs.php b/src/Concerns/ReportsScheduledTaskOutputs.php
@@ -38,11 +38,6 @@ private function getScheduledTaskRunDuration(): int
 
     public function scheduledTaskFailed(Event $task)
     {
-        if (! app('appkeep')->scheduledTaskMonitoringEnabled) {
-            // If monitoring is disabled, don't send the output
-            return;
-        }
-
         $duration = $this->getScheduledTaskRunDuration();
         $finishedAt = now();
 
@@ -61,11 +56,6 @@ public function scheduledTaskFailed(Event $task)
 
     public function scheduledTaskCompleted(Event $task)
     {
-        if (! app('appkeep')->scheduledTaskMonitoringEnabled) {
-            // If monitoring is disabled, don't send the output
-            return;
-        }
-
         $duration = $this->getScheduledTaskRunDuration();
         $finishedAt = now();