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

Display diagnostics for running monitors

Browse Source 
If a monitor is not running, the diagnostics function will not be called.
This commit is contained in:
Markus Mäkelä
2018-08-02 09:08:37 +03:00
parent be6a404c0b
commit 46ed043fb0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/monitor.cc
View File

@ -580,7 +580,7 @@ monitor_show(DCB *dcb, MXS_MONITOR *monitor)
if (monitor->instance) if (monitor->instance)
{ {
if (monitor->api->diagnostics) if (monitor->api->diagnostics && monitor->state == MONITOR_STATE_RUNNING)
{ {
monitor->api->diagnostics(monitor->instance, dcb); monitor->api->diagnostics(monitor->instance, dcb);
} }
@ -1830,7 +1830,8 @@ json_t* monitor_json_data(const MXS_MONITOR* monitor, const char* host)
/** Monitor parameters */ /** Monitor parameters */
json_object_set_new(attr, CN_PARAMETERS, monitor_parameters_to_json(monitor)); json_object_set_new(attr, CN_PARAMETERS, monitor_parameters_to_json(monitor));
if (monitor->instance && monitor->api->diagnostics_json) if (monitor->instance && monitor->api->diagnostics_json &&
monitor->state == MONITOR_STATE_RUNNING)
{ {
json_t* diag = monitor->api->diagnostics_json(monitor->instance); json_t* diag = monitor->api->diagnostics_json(monitor->instance);