Kaynağa Gözat

优化代码

niujiuru 4 hafta önce
ebeveyn
işleme
5749c4c025
2 değiştirilmiş dosya ile 12 ekleme ve 4 silme
  1. 8 4
      mqtt_reporter/data.go
  2. 4 0
      mqtt_reporter/photo.go

+ 8 - 4
mqtt_reporter/data.go

@@ -31,10 +31,8 @@ func (r *MQTTReporter) startDataWorker() {
 func (r *MQTTReporter) forwardDataToMqttServers(data []byte) {
 	logData := utils.FormatCompactJSON(data)
 	for _, server := range r.config.GetMQTTServers() {
-		select {
-		case <-r.ctx.Done():
-			return
-		default:
+		if r.ctx.Err() != nil {
+			break
 		}
 
 		if !server.Enable {
@@ -110,15 +108,21 @@ func (r *MQTTReporter) reportYFKJBackfillData() (int, error) {
 	var client *Client
 	var server MQTTServer
 	for _, s := range r.config.GetMQTTServers() {
+		if r.ctx.Err() != nil {
+			break
+		}
+
 		if !s.Enable || s.Protocol != "yfkj-private" || !s.DataBackfill {
 			continue
 		}
+
 		client = r.clients[s.Name]
 		if client != nil {
 			server = s
 			break
 		}
 	}
+
 	if client == nil {
 		return 0, nil
 	}

+ 4 - 0
mqtt_reporter/photo.go

@@ -68,6 +68,10 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string, isBackfill /* 
 	needImagBackfill := false
 
 	for _, server := range r.config.GetImagServers() {
+		if r.ctx.Err() != nil {
+			break
+		}
+
 		if !server.Enable {
 			continue
 		}