From dfcd553fdcf9556596506ffda66d716f6db5dc6b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 01 Apr 2011 04:13:42 -0400
Subject: [PATCH] Fixed bug in BIND monitor.
---
server/lib/classes/monitor_tools.inc.php | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index cfe6200..a9bdaed 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -518,8 +518,16 @@
/** the id of the server as int */
$server_id = intval($conf['server_id']);
- /** get the "active" Services of the server from the DB */
- $services = $app->dbmaster->queryOneRecord('SELECT * FROM server WHERE server_id = ' . $server_id);
+ /** get the "active" Services of the server from the DB */
+ $services = $app->db->queryOneRecord('SELECT * FROM server WHERE server_id = ' . $server_id);
+ /*
+ * If the DB is down, we have to set the db to "yes".
+ * If we don't do this, then the monitor will NOT monitor, that the db is down and so the
+ * rescue-module can not try to rescue the db
+ */
+ if ($services == null) {
+ $services['db_server'] = 1;
+ }
/* The type of the Monitor-data */
$type = 'services';
@@ -589,7 +597,7 @@
/* Monitor BIND-Server */
$data['bindserver'] = -1; // unknown - not needed
if ($services['dns_server'] == 1) {
- if ($this->_checkTcp('localhost', 53)) {
+ if ($this->_checkUdp('localhost', 53)) {
$data['bindserver'] = 1;
} else {
$data['bindserver'] = 0;
@@ -1535,10 +1543,22 @@
$fp = @fsockopen($host, $port, $errno, $errstr, 2);
if ($fp) {
+ /*
+ * We got a connection, but maybe apache is not able to send data over this
+ * connection?
+ */
+ fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ stream_set_timeout($fp, 2);
+ $res = fread($fp, 10);
+ $info = stream_get_meta_data($fp);
fclose($fp);
- return true;
+ if ($info['timed_out']) {
+ return false; // Apache was not able to send data over this connection
+ } else {
+ return true; // Apache was able to send data over this connection
+ }
} else {
- return false;
+ return false; // Apache was not able to establish a connection
}
}
@@ -1565,6 +1585,67 @@
return false;
}
}
+
+ /*
+ * Set the state to the given level (or higher, but not lesser).
+ * * If the actual state is critical and you call the method with ok,
+ * then the state is critical.
+ *
+ * * If the actual state is critical and you call the method with error,
+ * then the state is error.
+ */
+ private function _setState($oldState, $newState)
+ {
+ /*
+ * Calculate the weight of the old state
+ */
+ switch ($oldState) {
+ case 'no_state': $oldInt = 0;
+ break;
+ case 'ok': $oldInt = 1;
+ break;
+ case 'unknown': $oldInt = 2;
+ break;
+ case 'info': $oldInt = 3;
+ break;
+ case 'warning': $oldInt = 4;
+ break;
+ case 'critical': $oldInt = 5;
+ break;
+ case 'error': $oldInt = 6;
+ break;
+ }
+ /*
+ * Calculate the weight of the new state
+ */
+ switch ($newState) {
+ case 'no_state': $newInt = 0 ;
+ break;
+ case 'ok': $newInt = 1 ;
+ break;
+ case 'unknown': $newInt = 2 ;
+ break;
+ case 'info': $newInt = 3 ;
+ break;
+ case 'warning': $newInt = 4 ;
+ break;
+ case 'critical': $newInt = 5 ;
+ break;
+ case 'error': $newInt = 6 ;
+ break;
+ }
+
+ /*
+ * Set to the higher level
+ */
+ if ($newInt > $oldInt){
+ return $newState;
+ }
+ else
+ {
+ return $oldState;
+ }
+ }
private function _getIntArray($line) {
/** The array of float found */
--
Gitblit v1.9.1