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

Only add default value if none is provided

Browse Source 
The default parameter values should only be added if the configuration
doesn't have that parameter.
This commit is contained in:
Markus Mäkelä
2017-01-05 12:20:03 +02:00
parent 9fa2de29d9
commit ae31e3b0b5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/config.c
View File

@ -2678,7 +2678,8 @@ static void config_add_defaults(CONFIG_CONTEXT *ctx, const char *module, const c
{ {
for (int i = 0; mod->parameters[i].name; i++) for (int i = 0; mod->parameters[i].name; i++)
{ {
if (mod->parameters[i].default_value) if (mod->parameters[i].default_value &&
config_get_param(ctx->parameters, mod->parameters[i].name) == NULL)
{ {
ss_dassert(config_param_is_valid(module, type, mod->parameters[i].name, ss_dassert(config_param_is_valid(module, type, mod->parameters[i].name,
mod->parameters[i].default_value, ctx)); mod->parameters[i].default_value, ctx));