enh: wait for all action finish before close

controller/ws/tmq/tmq.go

@@ -1235,10 +1235,11 @@ func (t *TMQ) Close(logger *logrus.Entry) {
 	}()
 	select {
 	case <-ctx.Done():
-		logger.Error("wait for all goroutines to exit timeout")
+		logger.Warn("wait stop over 1 minute")
+		<-done
 	case <-done:
-		logger.Debug("all goroutines exit")
 	}
+	logger.Debug("wait stop done")
 	isDebug := log.IsDebug()
 
 	defer func() {

controller/ws/ws/handler.go

@@ -157,16 +157,20 @@ func (h *messageHandler) stop() {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 		defer cancel()
 
-		waitCh := make(chan struct{}, 1)
+		waitCh := make(chan struct{})
 		go func() {
 			h.wait.Wait()
 			close(waitCh)
 		}()
 
 		select {
 		case <-ctx.Done():
+			h.logger.Warn("wait stop over 1 minute")
+			<-waitCh
+			break
 		case <-waitCh:
 		}
+		h.logger.Debugf("wait stop done")
 		// clean query result and stmt
 		h.queryResults.FreeAll(h.logger)
 		h.stmts.FreeAll(h.logger)