From 24854cb22b746425ebad00aacd4af7e677666c03 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 05 May 2009 11:05:35 -0400
Subject: [PATCH] Merged the following revisions from Trunk:
---
server/mods-available/monitor_core_module.inc.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index b3aed2a..e1d0a2b 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -221,7 +221,7 @@
$usePercent = floatval($data[$i]['percent']);
//* We dont want to check the cdrom drive as a cd / dvd is always 100% full
- if($data[$i]['type'] != 'iso9660') {
+ if($data[$i]['type'] != 'iso9660' && $data[$i]['type'] != 'cramfs') {
if ($usePercent > 75) $state = $this->_setState($state, 'info');
if ($usePercent > 80) $state = $this->_setState($state, 'warning');
if ($usePercent > 90) $state = $this->_setState($state, 'critical');
@@ -701,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;
--
Gitblit v1.9.1