From 4077a64827da31092a524af888653da9f4c335cf Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Sun, 07 Dec 2008 08:46:50 -0500
Subject: [PATCH] The monitor now also supports the new db-replication mechanism
---
interface/web/monitor/show_sys_state.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 3d94a4e..7d7686e 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -102,7 +102,7 @@
*/
$html = '';
- $servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
+ $servers = $app->dbmaster->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
foreach ($servers as $server)
{
$html .= _getServerState($server['server_id'], $server['server_name'], false);
@@ -134,7 +134,7 @@
* get all monitoring-data from the server als process then
* (count them and set the server-state)
*/
- $records = $app->db->queryAllRecords("SELECT DISTINCT type FROM monitor_data WHERE server_id = " . $serverId);
+ $records = $app->dbmaster->queryAllRecords("SELECT DISTINCT type FROM monitor_data WHERE server_id = " . $serverId);
foreach($records as $record){
_processDbState($record['type'], $serverId, &$serverState, &$messages);
}
@@ -210,7 +210,7 @@
* state
*/
// get the State from the DB
- $record = $app->db->queryOneRecord("SELECT state FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $serverId . " order by created desc");
+ $record = $app->dbmaster->queryOneRecord("SELECT state FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $serverId . " order by created desc");
// change the new state to the highest state
$serverState = _setState($serverState, $record['state']);
// count the states
--
Gitblit v1.9.1