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

Always treat unloadable modules as an error

Browse Source 
When the loading of a module fails, be it due to a typo or a problem in
the library, the configuration is labeled as invalid.
This commit is contained in:
Markus Mäkelä 2018-08-25 08:33:11 +03:00
parent c92aa02961
commit 25c0d3da14
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/config.cc
View File

@ -2902,6 +2902,12 @@ check_config_objects(CONFIG_CONTEXT *context)
const MXS_MODULE *mod = nullptr;
std::tie(param_set, mod) = get_module_details(obj);
if (!mod) // Error is logged in load_module
{
rval = false;
continue;
}
mxb_assert(param_set);
std::vector<std::string> to_be_removed;
@ -2913,7 +2919,7 @@ check_config_objects(CONFIG_CONTEXT *context)
{
fix_params = param_set;
}
else if (mod && param_in_set(mod->parameters, params->name))
else if (param_in_set(mod->parameters, params->name))
{
fix_params = mod->parameters;
}
@ -2962,7 +2968,7 @@ check_config_objects(CONFIG_CONTEXT *context)
}
if (missing_required_parameters(param_set, obj->parameters, obj->object) ||
(mod && missing_required_parameters(mod->parameters, obj->parameters, obj->object)))
missing_required_parameters(mod->parameters, obj->parameters, obj->object))
{
rval = false;
}