From 46ed043fb0ed79ad55a5150b0aaad67773a4b515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Thu, 2 Aug 2018 09:08:37 +0300
Subject: [PATCH] Display diagnostics for running monitors

If a monitor is not running, the diagnostics function will not be called.
---
 server/core/monitor.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/core/monitor.cc b/server/core/monitor.cc
index c717128cd..ff2e9b3fe 100644
--- a/server/core/monitor.cc
+++ b/server/core/monitor.cc
@@ -580,7 +580,7 @@ monitor_show(DCB *dcb, MXS_MONITOR *monitor)
 
     if (monitor->instance)
     {
-        if (monitor->api->diagnostics)
+        if (monitor->api->diagnostics && monitor->state == MONITOR_STATE_RUNNING)
         {
             monitor->api->diagnostics(monitor->instance, dcb);
         }
@@ -1830,7 +1830,8 @@ json_t* monitor_json_data(const MXS_MONITOR* monitor, const char* host)
     /** Monitor parameters */
     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);