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

MXS-1949: Fix user injection warning

Browse Source 
If a service has no active servers and users are injected, a warning would
be logged. This is a misleading warning if the service has no servers and
should only be logged if the failure to load any users is an unexpected
situation.
This commit is contained in:
Markus Mäkelä
2018-07-05 12:49:46 +03:00
parent 33fa9b26fe
commit f44d305a46
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/modules/authenticator/MySQLAuth/mysql_auth.c
View File

@ -567,6 +567,19 @@ static bool add_service_user(SERV_LISTENER *port)
return rval; return rval;
} }
static bool service_has_servers(SERVICE* service)
{
for (SERVER_REF* s = service->dbref; s; s = s->next)
{
if (s->active)
{
return true;
}
}
return false;
}
/** /**
* @brief Load MySQL authentication users * @brief Load MySQL authentication users
* *
@ -623,9 +636,12 @@ static int mysql_auth_load_users(SERV_LISTENER *port)
if (injected) if (injected)
{ {
MXS_NOTICE("[%s] No users were loaded but 'inject_service_user' is enabled. " if (service_has_servers(service))
"Enabling service credentials for authentication until " {
"database users have been successfully loaded.", service->name); MXS_NOTICE("[%s] No users were loaded but 'inject_service_user' is enabled. "
"Enabling service credentials for authentication until "
"database users have been successfully loaded.", service->name);
}
} }
else if (loaded == 0 && !first_load) else if (loaded == 0 && !first_load)
{ {