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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-04-30 12:38:19 +03:00
parent 2f8bb71a58 1e700ab9ba
commit 490d8c0963
10 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/config_runtime.cc
View File

@ -448,6 +448,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
{
spinlock_acquire(&crt_lock);
bool valid = false;
const MXS_MODULE *mod = get_module(monitor->module_name, MODULE_MONITOR);
if (strcmp(key, CN_USER) == 0)
{
@ -522,7 +523,7 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, const char *key, const char *va
monitorSetScriptTimeout(monitor, ival);
}
}
else
else if (config_param_is_valid(mod->parameters, key, value, NULL))
{
/** We're modifying module specific parameters and we need to stop the monitor */
monitorStop(monitor);