From 2a3cab868b81cdaca3d30e88f0550a96f298c53b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Sep 2010 06:20:59 -0400
Subject: [PATCH] Implemented: FS#1324 - Add new file system path splitter for large installations
---
server/lib/classes/modules.inc.php | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index aa4a2ed..ed855b8 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -98,18 +98,25 @@
$data = unserialize($d["data"]);
}
//** Decode data back to locale
- /*
foreach($data['old'] as $key => $val) {
$data['old'][$key] = utf8_decode($val);
}
foreach($data['new'] as $key => $val) {
$data['new'][$key] = utf8_decode($val);
}
- */
$replication_error = false;
$this->current_datalog_id = $d["datalog_id"];
+
+ /*
+ * If we are in a mirror setup, rewrite the server_id of records that originally
+ * belonged to the mirrored server to the local server_id
+ */
+ if($conf["mirror_server_id"] > 0 && $d['dbtable'] != 'server') {
+ if(isset($data['new']['server_id']) && $data['new']['server_id'] == $conf["mirror_server_id"]) $data['new']['server_id'] = $conf["server_id"];
+ if(isset($data['old']['server_id']) && $data['old']['server_id'] == $conf["mirror_server_id"]) $data['old']['server_id'] = $conf["server_id"];
+ }
if(count($data['new']) > 0) {
if($d["action"] == 'i' || $d["action"] == 'u') {
@@ -165,7 +172,12 @@
if($replication_error == false) {
- $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ if(is_array($data['old']) || is_array($data['new'])) {
+ $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ } else {
+ $app->log("Data array was empty for datalog_id ".$d["datalog_id"],LOGLEVEL_WARN);
+ }
+ //$this->raiseTableHook($d["dbtable"],$d["action"],$data);
//$app->dbmaster->query("DELETE FROM sys_datalog WHERE datalog_id = ".$d["datalog_id"]);
//$app->log("Deleting sys_datalog ID ".$d["datalog_id"],LOGLEVEL_DEBUG);
$app->dbmaster->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf["server_id"]);
@@ -194,17 +206,19 @@
$data = unserialize($d["data"]);
}
//** decode data back to current locale
- /*
foreach($data['old'] as $key => $val) {
$data['old'][$key] = utf8_decode($val);
}
foreach($data['new'] as $key => $val) {
$data['new'][$key] = utf8_decode($val);
}
- */
$this->current_datalog_id = $d["datalog_id"];
- $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ if(is_array($data['old']) || is_array($data['new'])) {
+ $this->raiseTableHook($d["dbtable"],$d["action"],$data);
+ } else {
+ $app->log("Data array was empty for datalog_id ".$d["datalog_id"],LOGLEVEL_WARN);
+ }
//$app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
//$app->log("Deleting sys_datalog ID ".$rec["datalog_id"],LOGLEVEL_DEBUG);
$app->db->query("UPDATE server SET updated = ".$d["datalog_id"]." WHERE server_id = ".$conf["server_id"]);
--
Gitblit v1.9.1