From cafdec2a465ab57626a32efb065c6d054f71d8eb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Sep 2010 13:20:00 +0000
Subject: [PATCH] Fixed: FS#1287 - ispconfig.log rotated twice
---
install/lib/installer_base.lib.php | 2 ++
server/cron_daily.php | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3d3b60eb06..609556d864 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1470,6 +1470,7 @@ class installer_base {
//* Add Log-Rotation
if (is_dir('/etc/logrotate.d')) {
@unlink('/etc/logrotate.d/logispc3'); // ignore, if the file is not there
+ /* We rotate these logs in cron_daily.php
$fh = fopen('/etc/logrotate.d/logispc3', 'w');
fwrite($fh,
"/var/log/ispconfig/ispconfig.log { \n" .
@@ -1487,6 +1488,7 @@ class installer_base {
" delaycompress \n" .
"}");
fclose($fh);
+ */
}
}
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 83ef10c562..f311e75b84 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -234,6 +234,13 @@ if(is_file($logfile) && filesize($logfile) > 10000000) {
exec("cat /dev/null > $logfile");
}
+// rotate the cron.log when it exceeds a size of 10 MB
+$logfile = '/var/log/ispconfig/cron.log';
+if(is_file($logfile) && filesize($logfile) > 10000000) {
+ exec("gzip -c $logfile > $logfile.1.gz");
+ exec("cat /dev/null > $logfile");
+}
+
#######################################################################################################
// Cleanup website tmp directories
#######################################################################################################
--
GitLab