Added silenced expiration

laravel · Aug 14, 2023 · b4699df · b4699df
1 parent 0a587c9
commit b4699df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/config/horizon.php b/config/horizon.php
@@ -102,6 +102,7 @@
         'recent' => 60,
         'pending' => 60,
         'completed' => 60,
+        'silenced' => 60,
         'recent_failed' => 10080,
         'failed' => 10080,
         'monitored' => 10080,

diff --git a/src/Repositories/RedisJobRepository.php b/src/Repositories/RedisJobRepository.php
@@ -52,12 +52,19 @@ class RedisJobRepository implements JobRepository
     public $pendingJobExpires;
 
     /**
-     * The number of minutes until completed and silenced jobs should be purged.
+     * The number of minutes until completed jobs should be purged.
      *
      * @var int
      */
     public $completedJobExpires;
 
+    /**
+     * The number of minutes until silenced jobs should be purged.
+     *
+     * @var int
+     */
+    public $silencedJobExpires;
+
     /**
      * The number of minutes until failed jobs should be purged.
      *
@@ -84,6 +91,7 @@ public function __construct(RedisFactory $redis)
         $this->recentJobExpires = config('horizon.trim.recent', 60);
         $this->pendingJobExpires = config('horizon.trim.pending', 60);
         $this->completedJobExpires = config('horizon.trim.completed', 60);
+        $this->silencedJobExpires = config('horizon.trim.silenced', $this->completedJobExpires);
         $this->failedJobExpires = config('horizon.trim.failed', 10080);
         $this->recentFailedJobExpires = config('horizon.trim.recent_failed', $this->failedJobExpires);
         $this->monitoredJobExpires = config('horizon.trim.monitored', 10080);
@@ -283,7 +291,7 @@ protected function minutesForType($type)
             case 'completed_jobs':
                 return $this->completedJobExpires;
             case 'silenced_jobs':
-                return $this->completedJobExpires;
+                return $this->silencedJobExpires;
             default:
                 return $this->recentJobExpires;
         }
@@ -474,7 +482,8 @@ public function completed(JobPayload $payload, $failed = false, $silenced = fals
         }
 
         $this->connection()->pipeline(function ($pipe) use ($payload, $silenced) {
-            $this->storeJobReference($pipe, $silenced ? 'silenced_jobs' : 'completed_jobs', $payload);
+            $type = $silenced ? 'silenced_jobs' : 'completed_jobs';
+            $this->storeJobReference($pipe, $type, $payload);
             $this->removeJobReference($pipe, 'pending_jobs', $payload);
 
             $pipe->hmset(
@@ -484,7 +493,8 @@ public function completed(JobPayload $payload, $failed = false, $silenced = fals
                 ]
             );
 
-            $pipe->expireat($payload->id(), CarbonImmutable::now()->addMinutes($this->completedJobExpires)->getTimestamp());
+            $expires = $this->minutesForType($type);
+            $pipe->expireat($payload->id(), CarbonImmutable::now()->addMinutes($expires)->getTimestamp());
         });
     }
 
@@ -574,7 +584,7 @@ public function trimRecentJobs()
 
             $pipe->zremrangebyscore(
                 'silenced_jobs',
-                CarbonImmutable::now()->subMinutes($this->completedJobExpires)->getTimestamp() * -1,
+                CarbonImmutable::now()->subMinutes($this->silencedJobExpires)->getTimestamp() * -1,
                 '+inf'
             );
         });