update: only delete upsert data after successful upsertion

HDInnovations · Feb 13, 2025 · ec21147 · ec21147
1 parent e45231b
commit ec21147
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/app/Console/Commands/AutoUpdateUserLastActions.php b/app/Console/Commands/AutoUpdateUserLastActions.php
@@ -49,7 +49,7 @@ final public function handle(): void
 
         $userIdCount = Redis::command('LLEN', [$key]);
 
-        $userIds = Redis::command('LPOP', [$key, $userIdCount]);
+        $userIds = Redis::command('LRANGE', [$key, 0, $userIdCount - 1]);
 
         if ($userIds !== false) {
             DB::transaction(static function () use ($userIds): void {
@@ -61,6 +61,8 @@ final public function handle(): void
             }, 5);
         }
 
+        Redis::command('LTRIM', [$key, $userIdCount, -1]);
+
         $this->comment('Automated upsert histories command complete');
     }
 }
diff --git a/app/Console/Commands/AutoUpsertHistories.php b/app/Console/Commands/AutoUpsertHistories.php
@@ -73,7 +73,7 @@ final public function handle(): void
         $historyCount = Redis::connection('announce')->command('LLEN', [$key]);
 
         for ($historiesLeft = $historyCount; $historiesLeft > 0; $historiesLeft -= $historiesPerCycle) {
-            $histories = Redis::connection('announce')->command('LPOP', [$key, $historiesPerCycle]);
+            $histories = Redis::connection('announce')->command('LRANGE', [$key, 0, $historiesPerCycle - 1]);
 
             if ($histories === false) {
                 break;
@@ -103,6 +103,8 @@ final public function handle(): void
                     ],
                 );
             }, 5);
+
+            Redis::connection('announce')->command('LTRIM', [$key, $historiesPerCycle, -1]);
         }
 
         $this->comment('Automated upsert histories command complete');

diff --git a/app/Console/Commands/AutoUpsertPeers.php b/app/Console/Commands/AutoUpsertPeers.php
@@ -57,7 +57,7 @@ final public function handle(): void
         $peerCount = Redis::connection('announce')->command('LLEN', [$key]);
 
         for ($peersLeft = $peerCount; $peersLeft > 0; $peersLeft -= $peerPerCycle) {
-            $peers = Redis::connection('announce')->command('LPOP', [$key, $peerPerCycle]);
+            $peers = Redis::connection('announce')->command('LRANGE', [$key, 0, $peerPerCycle - 1]);
 
             if ($peers === false) {
                 break;
@@ -86,6 +86,8 @@ final public function handle(): void
                     ],
                 );
             }, 5);
+
+            Redis::connection('announce')->command('LTRIM', [$key, $peerPerCycle, -1]);
         }
 
         $this->comment('Automated insert peers command complete');

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -27,9 +27,9 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (! config('announce.external_tracker.is_enabled')) {
-            $schedule->command('auto:upsert_peers')->everyFiveSeconds();
-            $schedule->command('auto:upsert_histories')->everyFiveSeconds();
-            $schedule->command('auto:upsert_announces')->everyFiveSeconds();
+            $schedule->command('auto:upsert_peers')->everyFiveSeconds()->withoutOverlapping(2);
+            $schedule->command('auto:upsert_histories')->everyFiveSeconds()->withoutOverlapping(2);
+            $schedule->command('auto:upsert_announces')->everyFiveSeconds()->withoutOverlapping(2);
             $schedule->command('auto:cache_user_leech_counts')->everyThirtyMinutes();
             $schedule->command('auto:sync_peers')->everyFiveMinutes();
             $schedule->command('auto:torrent_balance')->hourly();