From 7660457b4612ae2bce8fb7b6897a3227884598b1 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 26 May 2010 09:02:15 -0400
Subject: [PATCH] Merged revisions 1682,1690 from trunk.
---
server/cron_daily.php | 17 +++++++++++++++--
install/tpl/debian_dovecot-sql.conf.master | 2 +-
install/tpl/fedora_dovecot-sql.conf.master | 2 +-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master
index 6e51db3..523237d 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -121,6 +121,6 @@
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT(maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', quota) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT(maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/fedora_dovecot-sql.conf.master b/install/tpl/fedora_dovecot-sql.conf.master
index 71b0c58..3053e3c 100644
--- a/install/tpl/fedora_dovecot-sql.conf.master
+++ b/install/tpl/fedora_dovecot-sql.conf.master
@@ -134,4 +134,4 @@
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT(maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', quota) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT(maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 4d9fc07..d173e20 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -231,19 +231,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