From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 04 Sep 2012 11:42:42 -0400
Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php-
---
server/lib/classes/modules.inc.php | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index fff4928..ce29432 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -83,11 +83,11 @@
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";
+ $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 LIMIT 0,1000";
} else {
- $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf['server_id']." OR server_id = 0) ORDER BY datalog_id";
+ $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf['server_id']." OR server_id = 0) ORDER BY datalog_id LIMIT 0,1000";
}
$records = $app->dbmaster->queryAllRecords($sql);
@@ -98,14 +98,17 @@
$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;
+ $data['mirrored'] = false;
$this->current_datalog_id = $d['datalog_id'];
@@ -113,9 +116,16 @@
* 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(isset($data['new']['server_id']) && $data['new']['server_id'] == $conf['mirror_server_id']) {
+ $data['new']['server_id'] = $conf['server_id'];
+ $data['mirrored'] = true;
+ }
+ if(isset($data['old']['server_id']) && $data['old']['server_id'] == $conf['mirror_server_id']) {
+ $data['old']['server_id'] = $conf['server_id'];
+ $data['mirrored'] = true;
+ }
}
if(count($data['new']) > 0) {
@@ -137,7 +147,7 @@
$app->db->query($sql);
if($app->db->errorNumber > 0) {
$replication_error = true;
- $app->log("Replication failed. Error: (" . $d[dbtable] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
+ $app->log("Replication failed. Error: (" . $d['dbtable'] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql,LOGLEVEL_ERROR);
}
$app->log('Replicated from master: '.$sql,LOGLEVEL_DEBUG);
}
@@ -197,7 +207,7 @@
//* if we have a single server setup
} else {
- $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf['server_id']." OR server_id = 0) ORDER BY datalog_id";
+ $sql = "SELECT * FROM sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf['server_id']." OR server_id = 0) ORDER BY datalog_id LIMIT 0,1000";
$records = $app->db->queryAllRecords($sql);
foreach($records as $d) {
@@ -206,12 +216,17 @@
$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);
}
+ */
+
+ //* Data on a single server is never mirrored
+ $data['mirrored'] = false;
$this->current_datalog_id = $d['datalog_id'];
if(is_array($data['old']) || is_array($data['new'])) {
@@ -225,8 +240,46 @@
$app->log('Processed datalog_id '.$d['datalog_id'],LOGLEVEL_DEBUG);
}
}
+ }
+
+ function processActions() {
+ global $app,$conf;
+ //* get the server_id of the local server
+ $server_id = intval($conf["server_id"]);
+ include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
+
+ //* SQL query to get all pending actions
+ $sql = "SELECT action_id, action_type, action_param " .
+ "FROM sys_remoteaction " .
+ "WHERE server_id = " . $server_id . " ".
+ " AND action_id > " . intval($maxid_remote_action) . " ".
+ "ORDER BY action_id";
+
+ $actions = $app->dbmaster->queryAllRecords($sql);
+
+ if(is_array($actions)) {
+ foreach($actions as $action) {
+
+ //* Raise the action
+ $state = $app->plugins->raiseAction($action['action_type'],$action['action_param']);
+
+ //* Update the action state
+ $sql = "UPDATE sys_remoteaction " .
+ "SET action_state = '" . $app->dbmaster->quote($state) . "' " .
+ "WHERE action_id = " . intval($action['action_id']);
+ $app->dbmaster->query($sql);
+
+ /*
+ * Then save the maxid for the next time...
+ */
+ $fp = fopen(ISPC_LIB_PATH."/remote_action.inc.php", 'wb');
+ $content = '<?php' . "\n" . '$maxid_remote_action = ' . $action['action_id'] . ';' . "\n?>";
+ fwrite($fp, $content);
+ fclose($fp);
+ }
+ }
@@ -243,9 +296,10 @@
foreach($hooks as $hook) {
$module_name = $hook['module'];
$function_name = $hook['function'];
- // Claa the processing function of the module
+ // Call the processing function of the module
if($this->debug) $app->log("Call function '$function_name' in module '$module_name' raised by TableHook '$table_name'.",LOGLEVEL_DEBUG);
- call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
+ // call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
+ call_user_func(array($app->loaded_modules[$module_name],$function_name),$table_name,$action,$data);
unset($module_name);
unset($function_name);
}
--
Gitblit v1.9.1