From 44d2a76d4611e27d348e1c8ed89ff0675f2d262f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 27 May 2009 08:49:48 -0400
Subject: [PATCH] Added missing error messages to the dns wizard. Improved language file loading.
---
server/mods-available/monitor_core_module.inc.php | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 53cdc28..9a26e83 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -219,10 +219,14 @@
* calculate the state
*/
$usePercent = floatval($data[$i]['percent']);
- if ($usePercent > 75) $state = $this->_setState($state, 'info');
- if ($usePercent > 80) $state = $this->_setState($state, 'warning');
- if ($usePercent > 90) $state = $this->_setState($state, 'critical');
- if ($usePercent > 95) $state = $this->_setState($state, 'error');
+
+ //* We dont want to check the cdrom drive as a cd / dvd is always 100% full
+ if($data[$i]['type'] != 'iso9660' && $data[$i]['type'] != 'cramfs' && $data[$i]['type'] != 'udf') {
+ if ($usePercent > 75) $state = $this->_setState($state, 'info');
+ if ($usePercent > 80) $state = $this->_setState($state, 'warning');
+ if ($usePercent > 90) $state = $this->_setState($state, 'critical');
+ if ($usePercent > 95) $state = $this->_setState($state, 'error');
+ }
}
}
@@ -697,7 +701,8 @@
* This monitoring is expensive, so do it only once a hour
*/
$min = date('i');
- if ($min != 0) return;
+ $hour = date('H');
+ if ($min != 0 && $hour != 23) return;
global $app;
global $conf;
@@ -1181,43 +1186,53 @@
if(@is_file('/etc/debian_version')) $dist = 'debian';
if(@is_file('/etc/redhat-release')) $dist = 'redhat';
+ if(@is_file('/etc/SuSE-release')) $dist = 'suse';
switch($log) {
case 'log_mail':
if($dist == 'debian') $logfile = '/var/log/mail.log';
if($dist == 'redhat') $logfile = '/var/log/maillog';
+ if($dist == 'suse') $logfile = '/var/log/mail.info';
break;
case 'log_mail_warn':
if($dist == 'debian') $logfile = '/var/log/mail.warn';
if($dist == 'redhat') $logfile = '/var/log/maillog';
+ if($dist == 'suse') $logfile = '/var/log/mail.warn';
break;
case 'log_mail_err':
if($dist == 'debian') $logfile = '/var/log/mail.err';
if($dist == 'redhat') $logfile = '/var/log/maillog';
+ if($dist == 'suse') $logfile = '/var/log/mail.err';
break;
case 'log_messages':
if($dist == 'debian') $logfile = '/var/log/messages';
if($dist == 'redhat') $logfile = '/var/log/messages';
+ if($dist == 'suse') $logfile = '/var/log/messages';
break;
case 'log_ispc_cron':
if($dist == 'debian') $logfile = '/var/log/ispconfig/cron.log';
if($dist == 'redhat') $logfile = '/var/log/ispconfig/cron.log';
+ if($dist == 'suse') $logfile = '/var/log/ispconfig/cron.log';
break;
case 'log_freshclam':
if($dist == 'debian') $logfile = '/var/log/clamav/freshclam.log';
if($dist == 'redhat') $logfile = (is_file('/var/log/clamav/freshclam.log') ? '/var/log/clamav/freshclam.log' : '/var/log/freshclam.log');
- break;
+ if($dist == 'suse') $logfile = '';
+ break;
case 'log_clamav':
if($dist == 'debian') $logfile = '/var/log/clamav/clamav.log';
if($dist == 'redhat') $logfile = (is_file('/var/log/clamav/clamd.log') ? '/var/log/clamav/clamd.log' : '/var/log/maillog');
+ if($dist == 'suse') $logfile = '';
break;
case 'log_fail2ban':
if($dist == 'debian') $logfile = '/var/log/fail2ban.log';
if($dist == 'redhat') $logfile = '/var/log/fail2ban.log';
+ if($dist == 'suse') $logfile = '/var/log/fail2ban.log';
break;
case 'log_ispconfig':
if($dist == 'debian') $logfile = '/var/log/ispconfig/ispconfig.log';
if($dist == 'redhat') $logfile = '/var/log/ispconfig/ispconfig.log';
+ if($dist == 'suse') $logfile = '/var/log/ispconfig/ispconfig.log';
break;
default:
$logfile = '';
--
Gitblit v1.9.1