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

MXS-2220 Move server_is_active inside the class

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-04 15:27:03 +02:00
parent 764d9a4e75
commit b16ee3a94e
10 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
View File

@ -636,7 +636,7 @@ int gssapi_auth_load_users(Listener* listener)
for (SERVER_REF* servers = listener->service()->dbref; servers; servers = servers->next)
{
if (!SERVER_REF_IS_ACTIVE(servers) || !server_is_active(servers->server))
if (!server_ref_is_active(servers) || !servers->server->server_is_active())
{
continue;
}

2
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -1220,7 +1220,7 @@ static int get_users(Listener* listener, bool skip_local)
for (server = service->dbref; !maxscale_is_shutting_down() && server; server = server->next)
{
if (!SERVER_REF_IS_ACTIVE(server) || !server_is_active(server->server)
if (!server_ref_is_active(server) || !server->server->server_is_active()
|| (skip_local && server_is_mxs_service(server->server))
|| !server_is_running(server->server))
{

2
server/modules/routing/hintrouter/hintrouter.cc
View File

@ -85,7 +85,7 @@ HintRouterSession* HintRouter::newSession(MXS_SESSION* pSession)
/* Go through the server references, find master and slaves */
for (SERVER_REF* pSref = pSession->service->dbref; pSref; pSref = pSref->next)
{
if (SERVER_REF_IS_ACTIVE(pSref))
if (server_ref_is_active(pSref))
{
if (server_is_master(pSref->server))
{

2
server/modules/routing/readconnroute/readconnroute.cc
View File

@ -315,7 +315,7 @@ static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session
*/
for (SERVER_REF* ref = inst->service->dbref; ref; ref = ref->next)
{
if (!SERVER_REF_IS_ACTIVE(ref) || server_is_in_maint(ref->server))
if (!server_ref_is_active(ref) || server_is_in_maint(ref->server))
{
continue;
}