improve cleanup

app/Jobs/CalculateUserSeedBonus.php

@@ -12,7 +12,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Nexus\Database\NexusDB;
 
-class CalculateSeedBonus implements ShouldQueue
+class CalculateUserSeedBonus implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -20,15 +20,28 @@ class CalculateSeedBonus implements ShouldQueue
 
     private int $endUid;
 
+    private string $requestId;
+
     /**
      * Create a new job instance.
      *
      * @return void
      */
-    public function __construct(int $beginUid, int $endUid)
+    public function __construct(int $beginUid, int $endUid, string $requestId = '')
     {
         $this->beginUid = $beginUid;
         $this->endUid = $endUid;
+        $this->requestId = $requestId;
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     *
+     * @return \DateTime
+     */
+    public function retryUntil()
+    {
+        return now()->addSeconds(Setting::get('main.autoclean_interval_one'));
     }
 
     /**
@@ -39,7 +52,7 @@ class CalculateSeedBonus implements ShouldQueue
     public function handle()
     {
         $beginTimestamp = time();
-        $logPrefix = sprintf("[CLEANUP_CLI_CALCULATE_SEED_BONUS], beginUid: %s, endUid: %s", $this->beginUid, $this->endUid);
+        $logPrefix = sprintf("[CLEANUP_CLI_CALCULATE_SEED_BONUS], commonRequestId: %s, beginUid: %s, endUid: %s", $this->requestId, $this->beginUid, $this->endUid);
         $sql = sprintf("select userid from peers where userid > %s and userid <= %s and seeder = 'yes' group by userid", $this->beginUid, $this->endUid);
         $results = NexusDB::select($sql);
         $count = count($results);

app/Jobs/UpdateSeedingLeechingTime.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Nexus\Database\NexusDB;
-
-class UpdateSeedingLeechingTime implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    private int $beginUid;
-
-    private int $endUid;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct(int $beginUid, int $endUid)
-    {
-        $this->beginUid = $beginUid;
-        $this->endUid = $endUid;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $beginTimestamp = time();
-        $logPrefix = sprintf("[CLEANUP_CLI_UPDATE_SEEDING_LEECHING_TIME], beginUid: %s, endUid: %s", $this->beginUid, $this->endUid);
-        $sql = sprintf("select id from users where id > %s and id <= %s and enabled = 'yes' and status = 'confirmed'", $this->beginUid, $this->endUid);
-        $results = NexusDB::select($sql);
-        do_log("$logPrefix, [GET_UID], sql: $sql, count: " . count($results));
-        foreach ($results as $arr) {
-            $uid = $arr['id'];
-            $sql = sprintf('select sum(seedtime) as st, sum(leechtime) as lt from snatched where userid = %s limit 1', $uid);
-            $row = NexusDB::select($sql);
-            if (is_numeric($row[0]['st'])) {
-                $sql = sprintf('update users set seedtime = %s, leechtime = %s where id = %s limit 1', $row[0]['st'], $row[0]['lt'], $uid);
-                NexusDB::statement($sql);
-            }
-        }
-        $costTime = time() - $beginTimestamp;
-        do_log("$logPrefix, [DONE], cost time: $costTime seconds");
-    }
-}

app/Jobs/UpdateTorrentSeedersEtc.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Nexus\Database\NexusDB;
+
+class UpdateTorrentSeedersEtc implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    private int $beginTorrentId;
+
+    private int $endTorrentId;
+
+    private string $requestId;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(int $beginTorrentId, int $endTorrentId, string $requestId = '')
+    {
+        $this->beginTorrentId = $beginTorrentId;
+        $this->endTorrentId = $endTorrentId;
+        $this->requestId = $requestId;
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     *
+     * @return \DateTime
+     */
+    public function retryUntil()
+    {
+        return now()->addSeconds(Setting::get('main.autoclean_interval_three'));
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $beginTimestamp = time();
+        $logPrefix = sprintf("[CLEANUP_CLI_UPDATE_TORRENT_SEEDERS_ETC], commonRequestId: %s, beginTorrentId: %s, endTorrentId: %s", $this->requestId, $this->beginTorrentId, $this->endTorrentId);
+        $sql = sprintf("update torrents set seeders = (select count(*) from peers where torrent = torrents.id and seeder = 'yes'), leechers = (select count(*) from peers where torrent = torrents.id and seeder = 'no'), comments = (select count(*) from comments where torrent = torrents.id) where id > %s and id <= %s",
+            $this->beginTorrentId, $this->endTorrentId
+        );
+        $result = NexusDB::statement($sql);
+        $costTime = time() - $beginTimestamp;
+        do_log(sprintf(
+            "$logPrefix, [DONE], sql: %s, result: %s, cost time: %s seconds",
+            preg_replace('/[\r\n\t]+/', ' ', $sql), var_export($result, true), $costTime
+        ));
+    }
+}

app/Jobs/UpdateUserSeedingLeechingTime.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Setting;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Nexus\Database\NexusDB;
+
+class UpdateUserSeedingLeechingTime implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    private int $beginUid;
+
+    private int $endUid;
+
+    private string $requestId;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(int $beginUid, int $endUid, string $requestId = '')
+    {
+        $this->beginUid = $beginUid;
+        $this->endUid = $endUid;
+        $this->requestId = $requestId;
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     *
+     * @return \DateTime
+     */
+    public function retryUntil()
+    {
+        return now()->addSeconds(Setting::get('main.autoclean_interval_four'));
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $beginTimestamp = time();
+        $logPrefix = sprintf("[CLEANUP_CLI_UPDATE_SEEDING_LEECHING_TIME], commonRequestId: %s, beginUid: %s, endUid: %s", $this->requestId, $this->beginUid, $this->endUid);
+        $sql = sprintf(
+            "update users set seedtime = (select sum(seedtime) from snatched where userid = users.id), leechtime=(select sum(leechtime) from snatched where userid = users.id) where id > %s and id <= %s and status = 'confirmed' and enabled = 'yes'",
+            $this->beginUid, $this->endUid
+        );
+        $results = NexusDB::statement($sql);
+        $costTime = time() - $beginTimestamp;
+        do_log("$logPrefix, [DONE], sql: $sql, results: " . var_export($results, true) . " cost time: $costTime seconds");
+    }
+}