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

Update to the user loading to skip servers that can not be connected to

Browse Source
This commit is contained in:
Mark Riddoch
2013-07-08 19:20:50 +02:00
parent 46f6d27b0b
commit 23b2a95d5a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/dbusers.c
View File

@ -52,6 +52,7 @@ load_mysql_users(SERVICE *service)
char *service_user = NULL; char *service_user = NULL;
char *service_passwd = NULL; char *service_passwd = NULL;
int total_users = 0; int total_users = 0;
SERVER *server;
serviceGetUser(service, &service_user, &service_passwd); serviceGetUser(service, &service_user, &service_passwd);
@ -62,7 +63,19 @@ load_mysql_users(SERVICE *service)
return -1; return -1;
} }
if (mysql_real_connect(con, service->databases->name, service_user, service_passwd, NULL, service->databases->port, NULL, 0) == NULL) { /*
* Attempt to connect to each database in the service in turn until
* we find one that we can connect to or until we run out of databases
* to try
*/
server = service->databases;
while (server && mysql_real_connect(con, server->name, service_user, service_passwd, NULL,
server->port, NULL, 0) == NULL)
{
server = server->nextdb;
}
if (server == NULL)
{
fprintf(stderr, "%s\n", mysql_error(con)); fprintf(stderr, "%s\n", mysql_error(con));
mysql_close(con); mysql_close(con);
return -1; return -1;