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

Bug 494 - remove error log report for missing servers for debugcli and cli router

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-12 15:45:10 +01:00
parent bfa92e6776
commit 46c4808c79
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/core/config.c
View File

@ -35,6 +35,8 @@
* 23/05/14 Massimiliano Pinto Added automatic set of maxscale-id: first listening ipv4_raw + port + pid * 23/05/14 Massimiliano Pinto Added automatic set of maxscale-id: first listening ipv4_raw + port + pid
* 28/05/14 Massimiliano Pinto Added detect_replication_lag parameter * 28/05/14 Massimiliano Pinto Added detect_replication_lag parameter
* 28/08/14 Massimiliano Pinto Added detect_stale_master parameter * 28/08/14 Massimiliano Pinto Added detect_stale_master parameter
* 12/09/14 Mark Riddoch Addition of checks on servers list and
* internal router suppression of messages
* *
* @endverbatim * @endverbatim
*/ */
@ -62,6 +64,7 @@ static int handle_global_item(const char *, const char *);
static void global_defaults(); static void global_defaults();
static void check_config_objects(CONFIG_CONTEXT *context); static void check_config_objects(CONFIG_CONTEXT *context);
static int config_truth_value(char *str); static int config_truth_value(char *str);
static int internalService(char *router);
static char *config_file = NULL; static char *config_file = NULL;
static GATEWAY_CONF gateway; static GATEWAY_CONF gateway;
@ -605,11 +608,13 @@ int error_count = 0;
{ {
char *servers; char *servers;
char *roptions; char *roptions;
char *router;
char *filters = config_get_value(obj->parameters, char *filters = config_get_value(obj->parameters,
"filters"); "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");
router = config_get_value(obj->parameters, "router");
if (servers && obj->element) if (servers && obj->element)
{ {
char *s = strtok(servers, ","); char *s = strtok(servers, ",");
@ -642,7 +647,7 @@ int error_count = 0;
s = strtok(NULL, ","); s = strtok(NULL, ",");
} }
} }
else if (servers == NULL) else if (servers == NULL && internalService(router) == 0)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
@ -1703,3 +1708,29 @@ config_truth_value(char *str)
return atoi(str); return atoi(str);
} }
static char *InternalRouters[] = {
"debugcli",
"cli",
NULL
};
/**
* Determine if the router is one of the special internal services that
* MaxScale offers.
*
* @param router The router name
* @return Non-zero if the router is in the InternalRouters table
*/
static int
internalService(char *router)
{
int i;
if (router)
{
for (i = 0; InternalRouters[i]; i++)
if (strcmp(router, InternalRouters[i]) == 0)
return 1;
}
return 0;
}