From 2d2fd172e1548dd24e1719accd0b856cff6a31a0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Fri, 18 Oct 2013 12:20:13 -0400
Subject: [PATCH] - Added funtion to convert currency formatted numbers back to floating numbers. - Improved getSearchSQL() function so that users can use their native date format so search for dates in lists.
---
server/mods-available/monitor_core_module.inc.php | 240 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 159 insertions(+), 81 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 9244b05..2e66d64 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -37,6 +37,8 @@
var $actions_available = array();
/** The Tools */
private $_tools = null;
+ //** time the script was called
+ private $_run_time = null;
/**
* This function is called during ispconfig installation to determine
@@ -52,11 +54,14 @@
*/
public function onLoad() {
global $app;
-
+
+ //* store the running time
+ $this->_run_time = time();
+
/*
* Do the monitor every n minutes and write the result to the db
*/
- $min = @date('i');
+ $min = @date('i', $this->_run_time);
if (($min % $this->interval) == 0) {
$this->_doMonitor();
}
@@ -86,6 +91,7 @@
/*
* Calls the single Monitoring steps
*/
+ $this->_monitorEmailQuota();
$this->_monitorHDQuota();
$this->_monitorServer();
$this->_monitorOsVer();
@@ -111,8 +117,45 @@
$this->_monitorRaid();
$this->_monitorRkHunter();
$this->_monitorFail2ban();
+ $this->_monitorIPTables();
$this->_monitorSysLog();
}
+
+ private function _monitorEmailQuota() {
+ global $app, $conf;
+
+ /*
+ * This monitoring is expensive, so do it only every 15 minutes
+ */
+ $min = @date('i', $this->_run_time);
+ if ($min % 15 != 0) return;
+
+ $app->uses('getconf');
+ $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+ if($mail_config['mailbox_quota_stats'] == 'n') return;
+
+
+ /*
+ * First we get the Monitoring-data from the tools
+ */
+ $res = $this->_tools->monitorEmailQuota();
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
+ 'VALUES (' .
+ $res['server_id'] . ', ' .
+ "'" . $app->dbmaster->quote($res['type']) . "', " .
+ 'UNIX_TIMESTAMP(), ' .
+ "'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+ "'" . $res['state'] . "'" .
+ ')';
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($res['type'], $res['server_id']);
+ }
private function _monitorHDQuota() {
global $app;
@@ -125,18 +168,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorServer() {
@@ -150,18 +193,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorOsVer() {
@@ -175,18 +218,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorIspcVer() {
@@ -200,18 +243,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorDiskUsage() {
@@ -225,18 +268,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMemUsage() {
@@ -249,18 +292,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorCpu() {
@@ -273,18 +316,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorServices() {
@@ -298,18 +341,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorOpenVzHost() {
@@ -323,18 +366,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorOpenVzUserBeancounter() {
@@ -348,25 +391,25 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorSystemUpdate() {
/*
* This monitoring is expensive, so do it only once an hour
*/
- $min = date('i');
+ $min = @date('i', $this->_run_time);
if ($min != 0)
return;
@@ -379,22 +422,26 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorSystemUpdate();
+
+ //* Ensure that output is encoded so that it does not break the serialize
+ //$res['data']['output'] = htmlentities($res['data']['output']);
+ $res['data']['output'] = htmlentities($res['data']['output'],ENT_QUOTES,'UTF-8');
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailQueue() {
@@ -408,18 +455,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorRaid() {
@@ -433,26 +480,26 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorRkHunter() {
/*
* This monitoring is expensive, so do it only once a day
*/
- $min = date('i');
- $hour = date('H');
+ $min = @date('i', $this->_run_time);
+ $hour = @date('H', $this->_run_time);
if (!($min == 0 && $hour == 23))
return;
/*
@@ -468,43 +515,69 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorFail2ban() {
+ global $app;
+
+ /*
+ * First we get the Monitoring-data from the tools
+ */
+ $res = $this->_tools->monitorFail2ban();
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
+ 'VALUES (' .
+ $res['server_id'] . ', ' .
+ "'" . $app->dbmaster->quote($res['type']) . "', " .
+ 'UNIX_TIMESTAMP(), ' .
+ "'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+ "'" . $res['state'] . "'" .
+ ')';
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($res['type'], $res['server_id']);
+ }
+
+
+ private function _monitorIPTables() {
global $app;
/*
* First we get the Monitoring-data from the tools
*/
- $res = $this->_tools->monitorFail2ban();
+ $res = $this->_tools->monitorIPTables();
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorSysLog() {
@@ -518,18 +591,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailLog() {
@@ -543,18 +616,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailWarnLog() {
@@ -568,18 +641,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailErrLog() {
@@ -593,18 +666,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMessagesLog() {
@@ -618,18 +691,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorISPCCronLog() {
@@ -639,22 +712,25 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorISPCCronLog();
+
+ //* Ensure that output is encoded so that it does not break the serialize
+ if(is_array($res) && isset($res['data'])) $res['data'] = htmlentities($res['data']);
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorFreshClamLog() {
@@ -668,18 +744,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorClamAvLog() {
@@ -693,18 +769,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorIspConfigLog() {
@@ -718,18 +794,18 @@
/*
* Insert the data into the database
*/
- $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+ $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, $res['server_id']);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
/**
@@ -741,8 +817,10 @@
private function _delOldRecords($type, $serverId) {
global $app;
- $now = time();
- $old = $now - (4 * 60); // 4 minutes
+ // $now = time();
+ // $old = $now - (4 * 60); // 4 minutes
+ $old = 'UNIX_TIMESTAMP() - 240';
+
/*
* ATTENTION if i do NOT pay attention of the server id, i delete all data (of the type)
* of ALL servers. This means, if i have a multiserver-environment and a server has a
@@ -763,4 +841,4 @@
}
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1