diff --git a/app/Jobs/CalculateUserSeedBonus.php b/app/Jobs/CalculateUserSeedBonus.php index a2c45107..a0b20371 100644 --- a/app/Jobs/CalculateUserSeedBonus.php +++ b/app/Jobs/CalculateUserSeedBonus.php @@ -44,6 +44,10 @@ class CalculateUserSeedBonus implements ShouldQueue return now()->addSeconds(Setting::get('main.autoclean_interval_one')); } + public $tries = 1; + + public $timeout = 600; + /** * Execute the job. * diff --git a/app/Jobs/GenerateTemporaryInvite.php b/app/Jobs/GenerateTemporaryInvite.php index 234cc24e..0def102f 100644 --- a/app/Jobs/GenerateTemporaryInvite.php +++ b/app/Jobs/GenerateTemporaryInvite.php @@ -45,6 +45,10 @@ class GenerateTemporaryInvite implements ShouldQueue return now()->addHours(1); } + public $tries = 1; + + public $timeout = 1800; + /** * Execute the job. * diff --git a/app/Jobs/UpdateTorrentSeedersEtc.php b/app/Jobs/UpdateTorrentSeedersEtc.php index 7c632616..1feb37b4 100644 --- a/app/Jobs/UpdateTorrentSeedersEtc.php +++ b/app/Jobs/UpdateTorrentSeedersEtc.php @@ -44,6 +44,10 @@ class UpdateTorrentSeedersEtc implements ShouldQueue return now()->addSeconds(Setting::get('main.autoclean_interval_three')); } + public $tries = 1; + + public $timeout = 1800; + /** * Execute the job. * diff --git a/app/Jobs/UpdateUserSeedingLeechingTime.php b/app/Jobs/UpdateUserSeedingLeechingTime.php index 3bc49840..5e572d71 100644 --- a/app/Jobs/UpdateUserSeedingLeechingTime.php +++ b/app/Jobs/UpdateUserSeedingLeechingTime.php @@ -44,6 +44,10 @@ class UpdateUserSeedingLeechingTime implements ShouldQueue return now()->addSeconds(Setting::get('main.autoclean_interval_four')); } + public $tries = 1; + + public $timeout = 3600; + /** * Execute the job. * @@ -52,7 +56,7 @@ class UpdateUserSeedingLeechingTime implements ShouldQueue 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); + $logPrefix = sprintf("[CLEANUP_CLI_UPDATE_SEEDING_LEECHING_TIME_HANDLE_JOB], 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), seed_time_updated_at = '%s' where id > %s and id <= %s and status = 'confirmed' and enabled = 'yes'", // now()->toDateTimeString(), $this->beginUid, $this->endUid @@ -81,7 +85,7 @@ class UpdateUserSeedingLeechingTime implements ShouldQueue NexusDB::table('users') ->where('id', $user->id) ->update($update); - do_log("$logPrefix, [SUCCESS]: $user->id => " . json_encode($update)); + do_log("[CLEANUP_CLI_UPDATE_SEEDING_LEECHING_TIME_HANDLE_USER], [SUCCESS]: $user->id => " . json_encode($update)); $count++; } } diff --git a/include/cleanup.php b/include/cleanup.php index 8a9704e0..1df86652 100644 --- a/include/cleanup.php +++ b/include/cleanup.php @@ -305,7 +305,7 @@ function docleanup($forceAll = 0, $printProgress = false) { $maxUid = $maxUidRes['max_uid']; $phpPath = nexus_env('PHP_PATH') ?: 'php'; $webRoot = rtrim(ROOT_PATH, '/'); - $chunk = 2000; + $chunk = 1000; $beginUid = 0; do_log("maxUid: $maxUid, chunk: $chunk"); do { @@ -404,7 +404,7 @@ function docleanup($forceAll = 0, $printProgress = false) { $maxTorrentIdRes = mysql_fetch_assoc(sql_query("select max(id) as max_torrent_id from torrents limit 1")); $maxTorrentId = $maxTorrentIdRes['max_torrent_id']; - $chunk = 5000; + $chunk = 1000; $beginTorrentId = 0; do_log("maxTorrentId: $maxTorrentId, chunk: $chunk"); do { @@ -883,7 +883,7 @@ function docleanup($forceAll = 0, $printProgress = false) { // sql_query("UPDATE users SET seedtime = " . intval($arr2['st']) . ", leechtime = " . intval($arr2['lt']) . " WHERE id = " . $arr['id']) or sqlerr(__FILE__, __LINE__); // } - $chunk = 2000; + $chunk = 1000; $beginUid = 0; do_log("maxUid: $maxUid, chunk: $chunk"); do {