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

MXS-1506: Simplify logging in connection creation

Browse Source 
The logging in the RWSplit::select_connect_backend_servers was quite
cumbersome and doing the logging when the connection is created makes for
a more information rich output (we know what servers were taken into use
and when).

Changed the log messages to use the names of the servers instead of the
address and port.
This commit is contained in:
Markus Mäkelä
2018-04-05 18:20:25 +03:00
parent d6f98784f7
commit ff5b2c85d6
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/modules/routing/readwritesplit/rwsplit_select_backends.cc
View File

@ -331,6 +331,7 @@ bool RWSplit::select_connect_backend_servers(MXS_SESSION *session,
{
if (backend->connect(session))
{
MXS_INFO("Selected Master: %s", backend->name());
current_master = backend;
}
break;
@ -339,7 +340,6 @@ bool RWSplit::select_connect_backend_servers(MXS_SESSION *session,
}
auto counts = get_slave_counts(backends, master);
int slaves_found = counts.first;
int slaves_connected = counts.second;
int max_nslaves = max_slave_count();
@ -352,6 +352,8 @@ bool RWSplit::select_connect_backend_servers(MXS_SESSION *session,
{
if (backend->can_connect() && backend->connect(session, sescmd_list))
{
MXS_INFO("Selected Slave: %s", backend->name());
if (sescmd_list && sescmd_list->size() && expected_responses)
{
(*expected_responses)++;
@ -361,25 +363,5 @@ bool RWSplit::select_connect_backend_servers(MXS_SESSION *session,
}
}
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO))
{
if (slaves_connected < max_nslaves)
{
MXS_INFO("Couldn't connect to maximum number of "
"slaves. Connected successfully to %d slaves "
"of %d of them.", slaves_connected, slaves_found);
}
for (SRWBackendList::const_iterator it = backends.begin(); it != backends.end(); it++)
{
const SRWBackend& backend = *it;
if (backend->in_use())
{
MXS_INFO("Selected %s in \t%s", STRSRVSTATUS(backend->server()),
backend->uri());
}
}
}
return true;
}