From 8a0dc479fbf7f41999be4342ff43bfb7cfe1ee39 Mon Sep 17 00:00:00 2001
From: mike_p <mike_p@ispconfig3>
Date: Sat, 29 May 2010 16:16:08 -0400
Subject: [PATCH] Create ids for the html so that css styling can be used
---
server/cron_daily.php | 77 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index dbedbff..766d6ab 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -36,7 +36,7 @@
// make sure server_id is always an int
$conf["server_id"] = intval($conf["server_id"]);
-
+
// Load required base-classes
$app->uses('ini_parser,file,services');
@@ -49,10 +49,10 @@
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
if(@is_file($rec["maildir"].'/ispconfig_mailsize')) {
-
+
// rename file
rename($rec["maildir"].'/ispconfig_mailsize',$rec["maildir"].'/ispconfig_mailsize_save');
-
+
// Read the file
$lines = file($rec["maildir"].'/ispconfig_mailsize_save');
$mail_traffic = 0;
@@ -60,16 +60,16 @@
$mail_traffic += intval($line);
}
unset($lines);
-
+
// Delete backup file
if(@is_file($rec["maildir"].'/ispconfig_mailsize_save')) unlink($rec["maildir"].'/ispconfig_mailsize_save');
-
+
// Save the traffic stats in the sql database
$tstamp = date("Y-m");
-
+
$sql = "SELECT * FROM mail_traffic WHERE month = '$tstamp' AND mailuser_id = ".$rec["mailuser_id"];
$tr = $app->dbmaster->queryOneRecord($sql);
-
+
$mail_traffic += $tr["traffic"];
if($tr["traffic_id"] > 0) {
$sql = "UPDATE mail_traffic SET traffic = $mail_traffic WHERE traffic_id = ".$tr["traffic_id"];
@@ -78,9 +78,9 @@
}
$app->dbmaster->query($sql);
echo $sql;
-
+
}
-
+
}
#######################################################################################################
@@ -166,7 +166,7 @@
exec("gzip -c $logfile > $logfile.gz");
unlink($logfile);
}
-
+
// delete logfiles after 30 days
$month_ago = date("Ymd",time() - 86400 * 30);
$logfile = escapeshellcmd($rec["document_root"].'/log/'.$month_ago.'-access.log.gz');
@@ -186,9 +186,7 @@
foreach($records as $rec){
$tmp_path = realpath(escapeshellcmd($rec["document_root"].'/tmp'));
if($tmp_path != '' && strlen($tmp_path) > 10 && is_dir($tmp_path) && $app->system->is_user($rec['system_user'])){
- exec("cd ".$tmp_path."; find -ctime +1 -user ".escapeshellcmd($rec['system_user'])." | grep -v -w .no_delete | xargs rm &> /dev/null");
- if($app->system->is_user('www-data')) exec("cd ".$tmp_path."; find -ctime +1 -user www-data | grep -v -w .no_delete | xargs rm &> /dev/null");
- if($app->system->is_user('wwwrun')) exec("cd ".$tmp_path."; find -ctime +1 -user wwwrun | grep -v -w .no_delete | xargs rm &> /dev/null");
+ exec("cd ".$tmp_path."; find -mtime +1 -name 'sess_*' | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
}
}
}
@@ -207,7 +205,21 @@
* if they are NOT ok, the server will try to process them in 1 minute and so the
* error appears again after 1 minute. So it is no problem to delete the old one!
*/
- $sql = "DELETE FROM sys_log WHERE tstamp < $tstamp AND server_id != 0";
+ $sql = "DELETE FROM sys_log WHERE tstamp < " . $tstamp . " AND server_id != 0";
+ $app->dbmaster->query($sql);
+
+ /*
+ * Delete all remote-actions "done" and older than 7 days
+ * ATTENTION: We have the same problem as described in cleaning the datalog. We must not
+ * delete the last entry
+ */
+ $sql = "SELECT max(action_id) FROM sys_remoteaction";
+ $res = $app->dbmaster->queryOneRecord($sql);
+ $maxId = $res['max(action_id)'];
+ $sql = "DELETE FROM sys_remoteaction " .
+ "WHERE tstamp < " . $tstamp . " " .
+ " AND action_status = 'ok' " .
+ " AND action_id <" . intval($maxId);
$app->dbmaster->query($sql);
/*
@@ -217,19 +229,32 @@
* actually in the system (and will be insered in 3 days or so).
* 2) We have to keey ALL entries which are not actually precessed by the
* server never mind how old they are!
+ * 3) We have to keep the entry with the highest autoinc-id, because mysql calculates the
+ * autoinc-id as "new value = max(row) +1" and does not store this in a separate table.
+ * This means, if we delete to entry with the highest autoinc-value then this value is
+ * reused as autoinc and so there are more than one entries with the same value (over
+ * for example 4 Weeks). This is confusing for our system.
+ * ATTENTION 2) and 3) is in some case NOT the same! so we have to check both!
*/
/* First we need all servers and the last sys_datalog-id they processed */
$sql = "SELECT server_id, updated FROM server ORDER BY server_id";
$records = $app->dbmaster->queryAllRecords($sql);
+ /* Then we need the highest value ever */
+ $sql = "SELECT max(datalog_id) FROM sys_datalog";
+ $res = $app->dbmaster->queryOneRecord($sql);
+ $maxId = $res['max(datalog_id)'];
+
/* Then delete server by server */
foreach($records as $server) {
$tmp_server_id = intval($server['server_id']);
if($tmp_server_id > 0) {
- $sql = "DELETE FROM sys_datalog WHERE tstamp < " . $tstamp .
+ $sql = "DELETE FROM sys_datalog " .
+ "WHERE tstamp < " . $tstamp .
" AND server_id = " . intval($server['server_id']) .
- " AND datalog_id < " . intval($server['updated']);
+ " AND datalog_id < " . intval($server['updated']) .
+ " AND datalog_id < " . intval($maxId);
}
// echo $sql . "\n";
$app->dbmaster->query($sql);
@@ -243,30 +268,30 @@
if ($app->dbmaster == $app->db) {
$current_month = date('Y-m');
-
+
//* Check website traffic quota
$sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE traffic_quota > 0 and type = 'vhost'";
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) {
foreach($records as $rec) {
-
+
$web_traffic_quota = $rec['traffic_quota'];
$domain = $rec['domain'];
-
+
// get the client
/*
$client_group_id = $rec["sys_groupid"];
$client = $app->db->queryOneRecord("SELECT limit_traffic_quota,parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
$reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota FROM client WHERE client_id = ".intval($client['parent_client_id']));
-
+
$client_traffic_quota = intval($client['limit_traffic_quota']);
$reseller_traffic_quota = intval($reseller['limit_traffic_quota']);
*/
-
+
//* get the traffic
- $tmp = $app->db->queryOneRecord("SELECT traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
- $web_traffic = $tmp['traffic_bytes']/1024/1024;
-
+ $tmp = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) As total_traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
+ $web_traffic = (int)$tmp['total_traffic_bytes']/1024/1024;
+
//* Website is over quota, we will disable it
/*if( ($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) ||
($client_traffic_quota > 0 && $web_traffic > $client_traffic_quota) ||
@@ -283,8 +308,8 @@
}
}
}
-
-
+
+
}
--
Gitblit v1.9.1