From 472bc938874596c78d52f10dd1e590cbb32e38ff Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 10 Feb 2012 10:21:00 -0500
Subject: [PATCH] - Added a fix to allow that master and slave database in a multiserver setup can reached on the same mysql hostname.
---
server/lib/classes/modules.inc.php | 2 +-
server/lib/app.inc.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 3065170..086d9a4 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -54,7 +54,7 @@
if we are in a multiserver setup
*/
- if($conf['dbmaster_host'] != '' && $conf['dbmaster_host'] != $conf['db_host']) {
+ if($conf['dbmaster_host'] != '' && ($conf['dbmaster_host'] != $conf['db_host'] || ($conf['dbmaster_host'] == $conf['db_host'] && $conf['dbmaster_database'] != $conf['db_database']))) {
$this->dbmaster = new db;
if($this->dbmaster->linkId) $this->dbmaster->closeConn();
$this->dbmaster->dbHost = $conf['dbmaster_host'];
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index ebb468e..7c579bc 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -83,7 +83,7 @@
global $app,$conf;
//* If its a multiserver setup
- if($app->db->dbHost != $app->dbmaster->dbHost) {
+ if($app->db->dbHost != $app->dbmaster->dbHost || ($app->db->dbHost == $app->dbmaster->dbHost && $app->db->dbName != $app->dbmaster->dbName)) {
if($conf['mirror_server_id'] > 0) {
$sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf['server_id']." OR server_id = ".$conf['mirror_server_id']." OR server_id = 0) ORDER BY datalog_id";
} else {
--
Gitblit v1.9.1