Skip to content

Commit 934ad8a

Browse files
author
Till Brehm
committed
Merge branch '6510-add-datalogid-to-error-message' into 'develop'
Improve verbosity when an error occurs during replication Closes #6510 See merge request ispconfig/ispconfig3!1747
2 parents f07208a + 065d491 commit 934ad8a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

server/lib/classes/modules.inc.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ function processDatalog() {
160160
}
161161
$params = array_merge($f_params, $params);
162162
unset($f_params);
163-
163+
164164
$tmp_sql1 = substr($tmp_sql1, 0, -1);
165165
$tmp_sql2 = substr($tmp_sql2, 0, -1);
166166
//$tmp_sql1 .= "$idx[0]";
@@ -171,14 +171,14 @@ function processDatalog() {
171171
$app->db->query($sql, true, $params);
172172
if($app->db->errorNumber > 0) {
173173
$replication_error = true;
174-
$app->log("Replication failed. Error: (" . $d['dbtable'] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);
174+
$app->log("Replication of datalog_id: " . $d['datalog_id'] . " failed. Error: (" . $d['dbtable'] . ") in MySQL server: (".$app->db->dbHost.") " . $app->db->errorMessage . " # SQL: " . $sql, LOGLEVEL_ERROR);
175175
}
176176
$log = $app->db->_build_query_string($sql, true, $params);
177177
$app->log('Replicated from master: '.$log, LOGLEVEL_DEBUG);
178178
unset($params);
179179
unset($log);
180180
}
181-
181+
182182
if($d['action'] == 'd') {
183183
$idx = explode(':', $d['dbidx']);
184184
$sql = "DELETE FROM ?? ";

0 commit comments

Comments
 (0)