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

MXS-2304 Use get_service() and get_server()

Browse Source
This commit is contained in:
Esa Korhonen
2019-01-31 16:29:31 +02:00
parent 882d360355
commit 3eb7d89c80
6 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/filter/tee/tee.cc
View File

@ -64,7 +64,7 @@ Tee::Tee(SERVICE* service,
*/
Tee* Tee::create(const char* name, MXS_CONFIG_PARAMETER* params)
{
SERVICE* service = config_get_service(params, "service");
SERVICE* service = params->get_service("service");
const char* source = config_get_string(params, "source");
const char* user = config_get_string(params, "user");
uint32_t cflags = params->get_enum("options", option_values);

2
server/modules/monitor/csmon/csmon.cc
View File

@ -117,7 +117,7 @@ void CsMonitor::update_server_status(MXS_MONITORED_SERVER* srv)
bool CsMonitor::configure(const MXS_CONFIG_PARAMETER* pParams)
{
m_primary = config_get_server(pParams, "primary");
m_primary = pParams->get_server("primary");
return true;
}

2
server/modules/routing/schemarouter/schemarouter.cc
View File

@ -24,7 +24,7 @@ Config::Config(MXS_CONFIG_PARAMETER* conf)
, debug(conf->get_bool("debug"))
, ignore_regex(config_get_compiled_regex(conf, "ignore_databases_regex", 0, NULL))
, ignore_match_data(ignore_regex ? pcre2_match_data_create_from_pattern(ignore_regex, NULL) : NULL)
, preferred_server(config_get_server(conf, "preferred_server"))
, preferred_server(conf->get_server("preferred_server"))
{
ignored_dbs.insert("mysql");
ignored_dbs.insert("information_schema");