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

Fix for config file ordering

Browse Source
This commit is contained in:
Mark Riddoch
2014-06-05 15:08:49 +01:00
parent ea177b481f
commit 01af5d1aef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/config.c
View File

@ -219,8 +219,6 @@ int error_count = 0;
{ {
char *router = config_get_value(obj->parameters, char *router = config_get_value(obj->parameters,
"router"); "router");
char *filters = config_get_value(obj->parameters,
"filters");
if (router) if (router)
{ {
char* max_slave_conn_str; char* max_slave_conn_str;
@ -307,9 +305,6 @@ int error_count = 0;
param->value))); param->value)));
} }
} }
if (filters)
serviceSetFilters(obj->element,
filters);
} }
else else
{ {
@ -431,7 +426,8 @@ int error_count = 0;
{ {
char *servers; char *servers;
char *roptions; char *roptions;
char *filters = config_get_value(obj->parameters,
"filters");
servers = config_get_value(obj->parameters, "servers"); servers = config_get_value(obj->parameters, "servers");
roptions = config_get_value(obj->parameters, roptions = config_get_value(obj->parameters,
"router_options"); "router_options");
@ -473,6 +469,10 @@ int error_count = 0;
s = strtok(NULL, ","); s = strtok(NULL, ",");
} }
} }
if (filters)
{
serviceSetFilters(obj->element, filters);
}
} }
else if (!strcmp(type, "listener")) else if (!strcmp(type, "listener"))
{ {