hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2220 Change server name to constant string

Browse Source
This commit is contained in:
Esa Korhonen
2018-12-19 15:15:02 +02:00
parent 5fc2c1f49c
commit 40485d746c
37 changed files with 194 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlogrouter/blr.cc
View File

@ -1314,7 +1314,7 @@ static void closeSession(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_sessio
time(0) - router->connect_time,
router->stats.n_binlogs_ses);
MXS_ERROR("Binlog router close session with master server %s",
router->service->dbref->server->name);
router->service->dbref->server->name());
blr_master_reconnect(router);
return;
}

8
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -177,7 +177,7 @@ static void blr_start_master(void* data)
"reached %d maximum number of retries. "
"Replication is stopped.",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
router->retry_limit);
return;
}
@ -246,7 +246,7 @@ static void blr_start_master(void* data)
MXS_ERROR("%s: failure while connecting to master server '%s', "
"retrying in %d seconds",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
connect_retry);
return;
}
@ -385,7 +385,7 @@ static void blr_restart_master(ROUTER_INSTANCE* router)
"reached %d maximum number of retries. "
"Replication is stopped.",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
router->retry_limit);
return;
}
@ -419,7 +419,7 @@ static void blr_restart_master(ROUTER_INSTANCE* router)
MXS_ERROR("%s: failed to connect to master server '%s', "
"retrying in %d seconds",
router->service->name,
router->service->dbref->server->name,
router->service->dbref->server->name(),
connect_retry);
}
else