Fix issue where the reloadNginx function never finishes (#431)

nginx · Aug 17, 2023 · 81b8d9d · 81b8d9d
1 parent 0f28539
commit 81b8d9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/plugins/nginx.go b/src/plugins/nginx.go
@@ -631,9 +631,6 @@ func (n *Nginx) tailLog(logFile string, errorChannel chan string) {
 	data := make(chan string, 1024)
 	go t.Tail(ctx, data)
 
-	tick := time.NewTicker(n.config.Nginx.ConfigReloadMonitoringPeriod)
-	defer tick.Stop()
-
 	for {
 		select {
 		case d := <-data:
@@ -648,10 +645,8 @@ func (n *Nginx) tailLog(logFile string, errorChannel chan string) {
 					return
 				}
 			}
-		case <-tick.C:
-			errorChannel <- ""
-			return
 		case <-ctx.Done():
+			errorChannel <- ""
 			return
 		}
 	}

diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go