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

MXS-1848 Parameters are not available at createInstance time

Browse Source 
The monitor parameters are not available when the monitor instance
is created so at least for the time being they are removed from
the API.
This commit is contained in:
Johan Wikman
2018-05-07 10:18:48 +03:00
parent 81654fb0e7
commit 5c1083c4aa
8 changed files with 66 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/modules/monitor/mmmon/mmmon.cc
View File

@ -38,7 +38,7 @@ MXS_MODULE info =
};
/*lint +e14 */
static MXS_MONITOR_INSTANCE *createInstance(MXS_MONITOR *, const MXS_CONFIG_PARAMETER *);
static MXS_MONITOR_INSTANCE *createInstance(MXS_MONITOR *);
static void destroyInstance(MXS_MONITOR_INSTANCE *);
static MXS_MONITOR_INSTANCE *startMonitor(MXS_MONITOR *, const MXS_CONFIG_PARAMETER *);
static void stopMonitor(MXS_MONITOR_INSTANCE *);
@ -110,8 +110,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
}
/*lint +e14 */
static MXS_MONITOR_INSTANCE* createInstance(MXS_MONITOR *mon,
const MXS_CONFIG_PARAMETER *params)
static MXS_MONITOR_INSTANCE* createInstance(MXS_MONITOR *mon)
{
MM_MONITOR* handle = static_cast<MM_MONITOR*>(MXS_CALLOC(1, sizeof(MM_MONITOR)));
@ -121,20 +120,10 @@ static MXS_MONITOR_INSTANCE* createInstance(MXS_MONITOR *mon,
handle->id = MXS_MONITOR_DEFAULT_ID;
handle->master = NULL;
handle->monitor = mon;
handle->detectStaleMaster = config_get_bool(params, "detect_stale_master");
handle->script = config_copy_string(params, "script");
handle->events = config_get_enum(params, "events", mxs_monitor_event_enum_values);
if (check_monitor_permissions(mon, "SHOW SLAVE STATUS"))
{
handle->checked = true;
}
else
{
handle->checked = false;
MXS_ERROR("Monitor cannot access servers. Starting the monitor will fail "
"unless problem was temporary or is addressed");
}
handle->detectStaleMaster = false;
handle->script = NULL;
handle->events = 0;
handle->checked = false;
}
return handle;