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

Fix calling a module command when module name has alternate mapping

Browse Source
This commit is contained in:
Esa Korhonen
2018-01-02 15:22:46 +02:00
parent f810ce9ea3
commit d587f4b3ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/modulecmd.cc
View File

@ -322,8 +322,8 @@ static bool process_argument(const MODULECMD *cmd, modulecmd_arg_type_t *type, c
case MODULECMD_ARG_MONITOR: case MODULECMD_ARG_MONITOR:
if ((arg->value.monitor = monitor_find((char*)value))) if ((arg->value.monitor = monitor_find((char*)value)))
{ {
if (MODULECMD_ALLOW_NAME_MISMATCH(type) || const char* eff_name = mxs_module_get_effective_name(arg->value.monitor->module_name);
strcmp(cmd->domain, arg->value.monitor->module_name) == 0) if (MODULECMD_ALLOW_NAME_MISMATCH(type) || strcmp(cmd->domain, eff_name) == 0)
{ {
arg->type.type = MODULECMD_ARG_MONITOR; arg->type.type = MODULECMD_ARG_MONITOR;
rval = true; rval = true;
@ -342,8 +342,8 @@ static bool process_argument(const MODULECMD *cmd, modulecmd_arg_type_t *type, c
case MODULECMD_ARG_FILTER: case MODULECMD_ARG_FILTER:
if ((arg->value.filter = filter_def_find((char*)value))) if ((arg->value.filter = filter_def_find((char*)value)))
{ {
if (MODULECMD_ALLOW_NAME_MISMATCH(type) || const char* eff_name = mxs_module_get_effective_name(arg->value.filter->module);
strcmp(cmd->domain, arg->value.filter->module) == 0) if (MODULECMD_ALLOW_NAME_MISMATCH(type) || strcmp(cmd->domain, eff_name) == 0)
{ {
arg->type.type = MODULECMD_ARG_FILTER; arg->type.type = MODULECMD_ARG_FILTER;
rval = true; rval = true;