Merge 3eaf6f6 into f86938d

grafana · Jul 13, 2023 · 11f3af5 · 11f3af5
2 parents f86938d + 3eaf6f6
commit 11f3af5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/log/loki.go b/log/loki.go
@@ -150,10 +150,13 @@ func (h *lokiHook) Listen(ctx context.Context) {
 		pushCh     = make(chan chan int64)
 	)
 
+	pushDone := make(chan struct{})
+	defer func() { <-pushDone }()
 	defer ticker.Stop()
 	defer close(pushCh)
 
 	go func() {
+		defer close(pushDone)
 		oldLogs := make([]tmpMsg, 0, h.limit*2)
 		for ch := range pushCh {
 			msgsToPush, msgs = msgs, msgsToPush