fix cleanup + attendance bonus

This commit is contained in:
xiaomlove
2022-03-09 12:08:14 +08:00
parent b8c288d07b
commit 7b8b7ed510
7 changed files with 24 additions and 16 deletions

View File

@@ -308,8 +308,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime2',".sqlesc($now).")") or sqlerr(__FILE__, __LINE__);
do_log("no value for arg: 'lastcleantime2', return");
return;
$log = "no value for arg: 'lastcleantime2', return";
do_log($log);
return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_two > $now && !$forceAll) {
@@ -333,8 +334,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime3',$now)") or sqlerr(__FILE__, __LINE__);
do_log("no value for arg: 'lastcleantime3', return");
return;
$log = "no value for arg: 'lastcleantime3', return";
do_log($log);
return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_three > $now && !$forceAll) {
@@ -492,8 +494,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime4',$now)") or sqlerr(__FILE__, __LINE__);
do_log("no value for arg: 'lastcleantime4', return");
return;
$log = "no value for arg: 'lastcleantime4', return";
do_log($log);
return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_four > $now && !$forceAll) {
@@ -818,8 +821,9 @@ function docleanup($forceAll = 0, $printProgress = false) {
$row = mysql_fetch_array($res);
if (!$row) {
sql_query("INSERT INTO avps (arg, value_u) VALUES ('lastcleantime5',$now)") or sqlerr(__FILE__, __LINE__);
do_log("no value for arg: 'lastcleantime5', return");
return;
$log = "no value for arg: 'lastcleantime5', return";
do_log($log);
return $log;
}
$ts = $row[0];
if ($ts + $autoclean_interval_five > $now && !$forceAll) {

View File

@@ -6,6 +6,7 @@
*/
require "bittorrent.php";
require 'cleanup.php';
$fd = fopen(sprintf('%s/nexus_cleanup_cli.lock', sys_get_temp_dir()), 'w+');
if (!flock($fd, LOCK_EX|LOCK_NB)) {
@@ -21,19 +22,18 @@ $force = 0;
if (isset($_SERVER['argv'][1])) {
$force = $_SERVER['argv'][1] ? 1 : 0;
}
$logPrefix = "[CLEANUP_CLI]";
try {
if ($force) {
require_once(ROOT_PATH . 'include/cleanup.php');
$result = docleanup(1, true);
} else {
$result = autoclean();
$result = autoclean(true);
}
$log = "[CLEANUP_CLI DONE!] $result";
$log = "$logPrefix, DONE: $result";
do_log($log);
printProgress($log);
} catch (\Exception $exception) {
$log = "ERROR: " . $exception->getMessage();
$log = "$logPrefix, ERROR: " . $exception->getMessage();
do_log($log);
printProgress($log);
throw new \RuntimeException($exception->getMessage());

View File

@@ -1902,7 +1902,7 @@ function userlogin() {
return $loginResult = true;
}
function autoclean() {
function autoclean($printProgress = false) {
global $autoclean_interval_one, $rootpath;
$now = TIMENOW;
$res = sql_query("SELECT value_u FROM avps WHERE arg = 'lastcleantime'");
@@ -1923,7 +1923,7 @@ function autoclean() {
return false;
}
require_once($rootpath . 'include/cleanup.php');
return docleanup();
return docleanup(0, $printProgress);
}
function unesc($x) {