Skip to content

Commit 942538f

Browse files
committed
Improved sys_datalog cleanup: FS#1089 - Clean sys_datalog
1 parent ab61404 commit 942538f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

server/cron_daily.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,19 @@ function setConfigVar( $filename, $varName, $varValue ) {
225225

226226
/* Then delete server by server */
227227
foreach($records as $server) {
228-
$sql = "DELETE FROM sys_datalog WHERE tstamp < " . $tstamp .
229-
" AND server_id != 0 " . // to be more secure!
230-
" AND server_id = " . intval($server['server_id']) .
231-
" AND datalog_id < " . intval($server['updated']);
228+
$tmp_server_id = intval($server['server_id']);
229+
if($tmp_server_id > 0) {
230+
$sql = "DELETE FROM sys_datalog WHERE tstamp < " . $tstamp .
231+
" AND server_id = " . intval($server['server_id']) .
232+
" AND datalog_id < " . intval($server['updated']);
233+
}
232234
// echo $sql . "\n";
233235
$app->dbmaster->query($sql);
234236
}
235237
}
236238

237239
#######################################################################################################
238-
// enforce traffic quota (only the "master-server")
240+
// enforce traffic quota (run only on the "master-server")
239241
#######################################################################################################
240242

241243
if ($app->dbmaster == $app->db) {

0 commit comments

Comments
 (0)