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

MXS-2304 Add contains() to test if a parameter exists

Browse Source 
Replaces uses of config_get_param() in modules either with contains()
or get_string(). The config_get_param() is moved to internal headers,
as it allows seeing inside a config setting.
This commit is contained in:
Esa Korhonen
2019-02-01 18:34:27 +02:00
parent 8e563bd0b6
commit 5ab7734e9d
11 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/avrorouter/avro.cc
View File

@ -94,11 +94,11 @@ void Avro::read_source_service_options(SERVICE* source)
Avro* Avro::create(SERVICE* service, SRowEventHandler handler)
{
SERVICE* source_service = NULL;
MXS_CONFIG_PARAMETER* param = config_get_param(service->svc_config_param, "source");
std::string source_name = service->svc_config_param->get_string("source");
if (param)
if (!source_name.empty())
{
SERVICE* source = service_find(param->value);
SERVICE* source = service_find(source_name.c_str());
mxb_assert(source);
if (source)
@ -119,7 +119,7 @@ Avro* Avro::create(SERVICE* service, SRowEventHandler handler)
}
else
{
MXS_ERROR("Service '%s' not found.", param->value);
MXS_ERROR("Service '%s' not found.", source_name.c_str());
return NULL;
}
}