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

MXS-2314 Do not accept NULL when starting/stopping monitor

Browse Source
This commit is contained in:
Johan Wikman
2019-02-08 14:51:15 +02:00
parent 3646c118c9
commit dffb933efa
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/monitor.cc
View File

@ -254,8 +254,8 @@ void MonitorManager::destroy_all_monitors()
*/ */
void MonitorManager::monitor_start(Monitor* monitor, const MXS_CONFIG_PARAMETER* params) void MonitorManager::monitor_start(Monitor* monitor, const MXS_CONFIG_PARAMETER* params)
{ {
if (monitor) mxb_assert(monitor);
{
Guard guard(monitor->m_lock); Guard guard(monitor->m_lock);
// Only start the monitor if it's stopped. // Only start the monitor if it's stopped.
@ -270,7 +270,6 @@ void MonitorManager::monitor_start(Monitor* monitor, const MXS_CONFIG_PARAMETER*
MXS_ERROR("Failed to start monitor '%s'.", monitor->m_name); MXS_ERROR("Failed to start monitor '%s'.", monitor->m_name);
} }
} }
}
} }
void MonitorManager::populate_services() void MonitorManager::populate_services()
@ -302,8 +301,8 @@ void monitor_start_all()
*/ */
void monitor_stop(Monitor* monitor) void monitor_stop(Monitor* monitor)
{ {
if (monitor) mxb_assert(monitor);
{
Guard guard(monitor->m_lock); Guard guard(monitor->m_lock);
/** Only stop the monitor if it is running */ /** Only stop the monitor if it is running */
@ -320,7 +319,6 @@ void monitor_stop(Monitor* monitor)
db->con = NULL; db->con = NULL;
} }
} }
}
} }
void monitor_deactivate(Monitor* monitor) void monitor_deactivate(Monitor* monitor)

6
server/core/resource.cc
View File

@ -260,14 +260,20 @@ private:
HttpResponse cb_stop_monitor(const HttpRequest& request) HttpResponse cb_stop_monitor(const HttpRequest& request)
{ {
Monitor* monitor = monitor_find(request.uri_part(1).c_str()); Monitor* monitor = monitor_find(request.uri_part(1).c_str());
if (monitor)
{
monitor_stop(monitor); monitor_stop(monitor);
}
return HttpResponse(MHD_HTTP_NO_CONTENT); return HttpResponse(MHD_HTTP_NO_CONTENT);
} }
HttpResponse cb_start_monitor(const HttpRequest& request) HttpResponse cb_start_monitor(const HttpRequest& request)
{ {
Monitor* monitor = monitor_find(request.uri_part(1).c_str()); Monitor* monitor = monitor_find(request.uri_part(1).c_str());
if (monitor)
{
MonitorManager::monitor_start(monitor, monitor->parameters); MonitorManager::monitor_start(monitor, monitor->parameters);
}
return HttpResponse(MHD_HTTP_NO_CONTENT); return HttpResponse(MHD_HTTP_NO_CONTENT);
} }