Browse Source

Merge branch 'dev/1.1.39.1_fuwencai' of BaseService/jyMicroservices into hotfix/v1.1.39.1

fuwencai 1 year ago
parent
commit
f3acdc5ad9
2 changed files with 6 additions and 2 deletions
  1. 3 1
      jyBXCore/entity/logs.go
  2. 3 1
      jyBXSubscribe/entity/logs.go

+ 3 - 1
jyBXCore/entity/logs.go

@@ -39,9 +39,11 @@ func NewSaveLog(name, saveColl string, mgoSaveCacheSize, sPSize, bulkSize, timeA
 
 
 // SendLogs 往通道发送数据
 // SendLogs 往通道发送数据
 func (s *SaveLogs) SendLogs(data map[string]interface{}) {
 func (s *SaveLogs) SendLogs(data map[string]interface{}) {
+	timer := time.NewTimer(time.Duration(s.Timeout) * time.Millisecond)
+	defer timer.Stop()
 	select {
 	select {
 	case s.MgoSaveCache <- data:
 	case s.MgoSaveCache <- data:
-	case <-time.After(time.Duration(s.Timeout) * time.Millisecond):
+	case <-timer.C:
 		log.Println("缓存通道已满,丢弃:", data)
 		log.Println("缓存通道已满,丢弃:", data)
 		return
 		return
 	}
 	}

+ 3 - 1
jyBXSubscribe/entity/logs.go

@@ -39,9 +39,11 @@ func NewSaveLog(name, saveColl string, mgoSaveCacheSize, sPSize, bulkSize, timeA
 
 
 // SendLogs 往通道发送数据
 // SendLogs 往通道发送数据
 func (s *SaveLogs) SendLogs(data map[string]interface{}) {
 func (s *SaveLogs) SendLogs(data map[string]interface{}) {
+	timer := time.NewTimer(time.Duration(s.Timeout) * time.Millisecond)
+	defer timer.Stop()
 	select {
 	select {
 	case s.MgoSaveCache <- data:
 	case s.MgoSaveCache <- data:
-	case <-time.After(time.Duration(s.Timeout) * time.Millisecond):
+	case <-timer.C:
 		log.Println("缓存通道已满,丢弃:", data)
 		log.Println("缓存通道已满,丢弃:", data)
 		return
 		return
 	}
 	}