From b5a0dc34a3bebd221fe8a564595d4c644122e11d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Dec 2010 17:21:13 -0500
Subject: [PATCH] Merged revisions 2144-2150 from stable branch.
---
server/mods-available/monitor_core_module.inc.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 4392812..4d9bfc3 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -203,8 +203,10 @@
$this->monitorMemUsage();
$this->monitorCpu();
$this->monitorServices();
- $this->monitorOpenVzHost();
- $this->monitorOpenVzUserBeancounter();
+ if(@file_exists('/proc/user_beancounters')) {
+ $this->monitorOpenVzHost();
+ $this->monitorOpenVzUserBeancounter();
+ }
$this->monitorMailLog();
$this->monitorMailWarnLog();
$this->monitorMailErrLog();
--
Gitblit v1.9.1