Merge pull request #720 from themsaid/completedJobsTrimming

[3.x] Allow trimming completed jobs
laravel · Feb 14, 2020 · f0295ee · f0295ee
2 parents 0f45a70 + 8356f5a
commit f0295ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/config/horizon.php b/config/horizon.php
@@ -95,6 +95,7 @@
 
     'trim' => [
         'recent' => 60,
+        'completed' => 60,
         'recent_failed' => 10080,
         'failed' => 10080,
         'monitored' => 10080,

diff --git a/src/Repositories/RedisJobRepository.php b/src/Repositories/RedisJobRepository.php
@@ -42,6 +42,13 @@ class RedisJobRepository implements JobRepository
      */
     public $recentJobExpires;
 
+    /**
+     * The number of minutes until completed jobs should be purged.
+     *
+     * @var int
+     */
+    public $recentCompletedExpires;
+
     /**
      * The number of minutes until failed jobs should be purged.
      *
@@ -66,6 +73,7 @@ public function __construct(RedisFactory $redis)
     {
         $this->redis = $redis;
         $this->recentJobExpires = config('horizon.trim.recent', 60);
+        $this->recentCompletedExpires = config('horizon.trim.completed', 60);
         $this->failedJobExpires = config('horizon.trim.failed', 10080);
         $this->recentFailedJobExpires = config('horizon.trim.recent_failed', $this->failedJobExpires);
         $this->monitoredJobExpires = config('horizon.trim.monitored', 10080);
@@ -403,7 +411,7 @@ protected function markJobAsCompleted($pipe, $id, $failed)
             ? $pipe->hmset($id, ['status' => 'failed'])
             : $pipe->hmset($id, ['status' => 'completed', 'completed_at' => str_replace(',', '.', microtime(true))]);
 
-        $pipe->expireat($id, Chronos::now()->addMinutes($this->recentJobExpires)->getTimestamp());
+        $pipe->expireat($id, Chronos::now()->addMinutes($this->recentCompletedExpires)->getTimestamp());
     }
 
     /**