From 57c8b2514bf1c76e9e1be25fe88beaffd3f9bce6 Mon Sep 17 00:00:00 2001
From: Antennipasi <Antennipasi@ispconfig3>
Date: Mon, 29 Dec 2008 08:40:10 -0500
Subject: [PATCH] Added finnish index-pages.
---
server/mods-available/monitor_core_module.inc.php | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index cbd2417..7a886fa 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -113,6 +113,7 @@
$this->monitorMailWarnLog();
$this->monitorMailErrLog();
$this->monitorMessagesLog();
+ $this->monitorISPCCronLog();
$this->monitorFreshClamLog();
$this->monitorClamAvLog();
$this->monitorIspConfigLog();
@@ -261,7 +262,7 @@
$memInfo = explode("\n", $miData);
foreach($memInfo as $line){
- $part = split(":", $line);
+ $part = preg_split("/:/", $line);
$key = trim($part[0]);
$tmp = explode(" ", trim($part[1]));
$value = 0;
@@ -311,7 +312,7 @@
$cpuInfo = explode("\n", $cpuData);
foreach($cpuInfo as $line){
- $part = split(":", $line);
+ $part = preg_split("/:/", $line);
$key = trim($part[0]);
$value = trim($part[1]);
$data[$key] = $value;
@@ -937,6 +938,43 @@
$this->_delOldRecords($type, 10);
}
+ function monitorISPCCronLog()
+ {
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'log_ispc_cron';
+
+ /* Get the data of the log */
+ $data = $this->_getLogData($type);
+
+ /*
+ * actually this info has no state.
+ * maybe someone knows better...???...
+ */
+ $state = 'no_state';
+
+ /*
+ Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
function monitorFreshClamLog()
{
global $app;
@@ -1092,6 +1130,9 @@
case 'log_messages':
$logfile = '/var/log/messages';
break;
+ case 'log_ispc_cron':
+ $logfile = '/var/log/ispconfig/cron.log';
+ break;
case 'log_freshclam':
$logfile = '/var/log/clamav/freshclam.log';
break;
--
Gitblit v1.9.1