From c71ab49d6bc8a595fb7ef62efbadbfaa27bb5ec9 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 14 Aug 2020 06:00:25 +0000
Subject: [PATCH] TD-1143

---
 src/plugins/monitor/src/monitorMain.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c
index 55c242763b..d76bb4bd82 100644
--- a/src/plugins/monitor/src/monitorMain.c
+++ b/src/plugins/monitor/src/monitorMain.c
@@ -234,17 +234,22 @@ static void monitorInitDatabaseCb(void *param, TAOS_RES *result, int32_t code) {
 }
 
 void monitorStopSystem() {
-  monitorInfo("monitor module is stopped");
-  monitorExecuteSQLFp = NULL;
+  if (tsMonitorConn.state == MONITOR_STATE_STOPPED) return;
   tsMonitorConn.state = MONITOR_STATE_STOPPED;
+  monitorExecuteSQLFp = NULL;
+
+  monitorInfo("monitor module is stopped");
+
   if (tsMonitorConn.initTimer != NULL) {
     taosTmrStopA(&(tsMonitorConn.initTimer));
   }
   if (tsMonitorConn.timer != NULL) {
     taosTmrStopA(&(tsMonitorConn.timer));
   }
-
-  taos_close(tsMonitorConn.conn);
+  if (tsMonitorConn.conn != NULL) {
+    taos_close(tsMonitorConn.conn);
+    tsMonitorConn.conn = NULL;
+  }
 }
 
 void monitorCleanUpSystem() {
-- 
GitLab