add real sql-query to debug-log

Florian Schaal · Florian Schaal · commit 93177377cede · 2015-08-17T13:46:17.000+02:00
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
@@ -152,12 +152,14 @@ function processDatalog() {
 						$app->db->errorNumber = 0;
 						$app->db->errorMessage = '';
 						$app->db->query($sql, true, $params);
-						unset($params);
 						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('Replicated from master: '.$sql, LOGLEVEL_DEBUG);
+						$log = $app->db->_build_query_string($sql, true, $params);
+						$app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);
+						unset($params);
+						unset($log);
 					}
 					
 					if($d['action'] == 'd') {
@@ -169,7 +171,9 @@ function processDatalog() {
 							$replication_error = true;
 							$app->log("Replication failed. Error: (" . $d[dbtable] . ") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);
 						}
-						$app->log('Replicated from master: '.$sql, LOGLEVEL_DEBUG);
+						$log = $app->db->_build_query_string($sql, $d['dbtable'], $idx[0], $idx[1]);
+						$app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);
+						unset($log);
 					}
 
 

Original file line number	Diff line number	Diff line change
`@@ -152,12 +152,14 @@ function processDatalog() {`
`152`	`152`	`$app->db->errorNumber = 0;`
`153`	`153`	`$app->db->errorMessage = '';`
`154`	`154`	`$app->db->query($sql, true, $params);`
`155`		`- unset($params);`
`156`	`155`	`if($app->db->errorNumber > 0) {`
`157`	`156`	`$replication_error = true;`
`158`	`157`	`$app->log("Replication failed. Error: (" . $d['dbtable'] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);`
`159`	`158`	`}`
`160`		`- $app->log('Replicated from master: '.$sql, LOGLEVEL_DEBUG);`
	`159`	`+ $log = $app->db->_build_query_string($sql, true, $params);`
	`160`	`+ $app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);`
	`161`	`+ unset($params);`
	`162`	`+ unset($log);`
`161`	`163`	`}`
`162`	`164`
`163`	`165`	`if($d['action'] == 'd') {`
`@@ -169,7 +171,9 @@ function processDatalog() {`
`169`	`171`	`$replication_error = true;`
`170`	`172`	`$app->log("Replication failed. Error: (" . $d[dbtable] . ") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);`
`171`	`173`	`}`
`172`		`- $app->log('Replicated from master: '.$sql, LOGLEVEL_DEBUG);`
	`174`	`+ $log = $app->db->_build_query_string($sql, $d['dbtable'], $idx[0], $idx[1]);`
	`175`	`+ $app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);`
	`176`	`+ unset($log);`
`173`	`177`	`}`
`174`	`178`
`175`	`179`