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

Updates configuration for backward compatibility and improved error handling

Browse Source
This commit is contained in:
Mark Riddoch
2013-12-02 15:14:52 +00:00
parent 37426a8be6
commit 84fbf15bef
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
server/core/config.c
View File

@ -195,8 +195,22 @@ int error_count = 0;
config_get_value(obj->parameters, "user"); config_get_value(obj->parameters, "user");
char *auth = char *auth =
config_get_value(obj->parameters, "passwd"); config_get_value(obj->parameters, "passwd");
if (!auth)
auth = config_get_value(obj->parameters, "auth");
if (obj->element && user && auth) if (obj->element && user && auth)
{
serviceSetUser(obj->element, user, auth); serviceSetUser(obj->element, user, auth);
}
else if (user && auth == NULL)
{
skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Service '%s' has a "
"user defined but no "
"corresponding password.",
obj->object);
}
} }
else else
{ {
@ -225,9 +239,11 @@ int error_count = 0;
monpw = config_get_value(obj->parameters, "monitorpw"); monpw = config_get_value(obj->parameters, "monitorpw");
if (address && port && protocol) if (address && port && protocol)
{
obj->element = server_alloc(address, obj->element = server_alloc(address,
protocol, protocol,
atoi(port)); atoi(port));
}
else else
{ {
obj->element = NULL; obj->element = NULL;
@ -243,6 +259,14 @@ int error_count = 0;
} }
if (obj->element && monuser && monpw) if (obj->element && monuser && monpw)
serverAddMonUser(obj->element, monuser, monpw); serverAddMonUser(obj->element, monuser, monpw);
else if (monuser && monpw == NULL)
{
skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Server '%s' has a monitoruser"
"defined but no corresponding password.",
obj->object);
}
} }
obj = obj->next; obj = obj->next;
} }
@ -320,9 +344,21 @@ int error_count = 0;
while (ptr && strcmp(ptr->object, service) != 0) while (ptr && strcmp(ptr->object, service) != 0)
ptr = ptr->next; ptr = ptr->next;
if (ptr && ptr->element) if (ptr && ptr->element)
{
serviceAddProtocol(ptr->element, serviceAddProtocol(ptr->element,
protocol, protocol,
atoi(port)); atoi(port));
}
else
{
skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Listener '%s', "
"service '%s' not found. "
"Listener will not execute.",
obj->object, service);
error_count++;
}
} }
else else
{ {
@ -377,6 +413,15 @@ int error_count = 0;
user, user,
passwd); passwd);
} }
else if (obj->element && user)
{
skygw_log_write_flush(
LOGFILE_ERROR, "Error: "
"Monitor '%s' defines a "
"username with no password.",
obj->object);
error_count++;
}
} }
else else
{ {