Replace use of storage logs by passing output to events (#298)

Author: shawnheide

config/totem.php

@@ -234,6 +234,4 @@
         'enabled' => env('TOTEM_BROADCASTING_ENABLED', true),
         'channel' => env('TOTEM_BROADCASTING_CHANNEL', 'task.events'),
     ],
-
-    'log_folder' => env('TOTEM_LOG_FOLDER', 'totem'),
 ];

src/Events/Executed.php

@@ -2,7 +2,6 @@
 
 namespace Studio\Totem\Events;
 
-use Illuminate\Support\Facades\Storage;
 use Studio\Totem\Notifications\TaskCompleted;
 use Studio\Totem\Task;
 
@@ -14,24 +13,18 @@ class Executed extends BroadcastingEvent
      * @param Task $task
      * @param string $started
      */
-    public function __construct(Task $task, $started)
+    public function __construct(Task $task, $started, $output)
     {
         parent::__construct($task);
 
         $time_elapsed_secs = microtime(true) - $started;
 
-        if (Storage::exists($task->getMutexName())) {
-            $output = Storage::get($task->getMutexName());
+        $task->results()->create([
+            'duration'  => $time_elapsed_secs * 1000,
+            'result'    => $output,
+        ]);
 
-            $task->results()->create([
-                'duration'  => $time_elapsed_secs * 1000,
-                'result'    => $output,
-            ]);
-
-            Storage::delete($task->getMutexName());
-
-            $task->notify(new TaskCompleted($output));
-            $task->autoCleanup();
-        }
+        $task->notify(new TaskCompleted($output));
+        $task->autoCleanup();
     }
 }

src/Providers/ConsoleServiceProvider.php

@@ -3,7 +3,6 @@
 namespace Studio\Totem\Providers;
 
 use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\ServiceProvider;
 use Studio\Totem\Events\Executed;
 use Studio\Totem\Events\Executing;
@@ -34,10 +33,6 @@ public function schedule(Schedule $schedule)
     {
         $tasks = app('totem.tasks')->findAllActive();
 
-        Storage::makeDirectory(config('totem.log_folder'));
-
-        Storage::put(config('totem.log_folder').'/test.txt', 'abcdegf');
-
         $tasks->each(function ($task) use ($schedule) {
             $event = $schedule->command($task->command, $task->compileParameters(true));
 
@@ -48,10 +43,9 @@ public function schedule(Schedule $schedule)
                     $event->start = microtime(true);
                     Executing::dispatch($task);
                 })
-                ->after(function () use ($event, $task) {
-                    Executed::dispatch($task, $event->start ?? microtime(true));
-                })
-                ->sendOutputTo(Storage::path($task->getMutexName()));
+                ->thenWithOutput(function ($output) use ($event, $task) {
+                    Executed::dispatch($task, $event->start ?? microtime(true), $output);
+                });
             if ($task->dont_overlap) {
                 $event->withoutOverlapping();
             }

src/Repositories/EloquentTaskRepository.php

@@ -6,7 +6,6 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Storage;
 use Studio\Totem\Contracts\TaskInterface;
 use Studio\Totem\Events\Activated;
 use Studio\Totem\Events\Created;
@@ -195,13 +194,12 @@ public function execute($id)
         $start = microtime(true);
         try {
             Artisan::call($task->command, $task->compileParameters());
-
-            Storage::put($task->getMutexName(), Artisan::output());
+            $output = Artisan::output();
         } catch (\Exception $e) {
-            Storage::put($task->getMutexName(), $e->getMessage());
+            $output = $e->getMessage();
         }
 
-        Executed::dispatch($task, $start);
+        Executed::dispatch($task, $start, $output);
 
         return $task;
     }

src/Traits/HasFrequencies.php

@@ -116,16 +116,6 @@ public function getCronExpression()
         return $this->expression;
     }
 
-    /**
-     * Get the mutex name for the scheduled task.
-     *
-     * @return string
-     */
-    public function getMutexName()
-    {
-        return config('totem.log_folder').DIRECTORY_SEPARATOR.'schedule-'.sha1($this->expression.$this->command.$this->parameters);
-    }
-
     /**
      * Determine if the filters pass for the event.
      *