From 374c8db63dca02dcf62d64448dc408897925c19f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 08:24:42 -0400
Subject: [PATCH] Improved some list templates and the dashboard template.
---
server/cron_daily.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index dbedbff..7299e9f 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -179,6 +179,7 @@
// Cleanup website tmp directories
#######################################################################################################
+/*
$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
$records = $app->db->queryAllRecords($sql);
$app->uses('system');
@@ -186,9 +187,22 @@
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 -ctime +1 -user ".escapeshellcmd($rec['system_user'])." | grep -v -w .no_delete | xargs rm &> /dev/null 2> /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 2> /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 2> /dev/null");
+ }
+ }
+}
+*/
+
+$sql = "SELECT domain_id, domain, document_root, system_user FROM web_domain WHERE server_id = ".$conf["server_id"];
+$records = $app->db->queryAllRecords($sql);
+$app->uses('system');
+if(is_array($records)) {
+ 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 -mtime +2 -name 'sess_*' | grep -v -w .no_delete | xargs rm &> /dev/null 2> /dev/null");
}
}
}
@@ -207,7 +221,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 +245,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);
--
Gitblit v1.9.1