From 34f1cc076c36377582222f6628cddc68e55492bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Sun, 26 Jun 2022 13:32:15 +0200
Subject: [PATCH] Cleanup: Worker, simplify Listerer.Run() function

No functional changes, except that now the "listener shutting down"
message will also be logged in case of a panic.
---
 internal/worker/listener.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/internal/worker/listener.go b/internal/worker/listener.go
index 51396cca..53c19c96 100644
--- a/internal/worker/listener.go
+++ b/internal/worker/listener.go
@@ -46,20 +46,17 @@ func NewListener(client FlamencoClient, buffer UpstreamBuffer) *Listener {
 }
 
 func (l *Listener) Run(ctx context.Context) {
-	keepRunning := true
-	for keepRunning {
+	defer l.doneWg.Done()
+	defer log.Debug().Msg("listener shutting down")
+
+	for {
 		select {
 		case <-ctx.Done():
-			keepRunning = false
-			continue
+			return
 		case <-time.After(10 * time.Second):
-			// This is just a dummy thing.
+			log.Trace().Msg("listener is still running")
 		}
-		log.Trace().Msg("listener is still running")
 	}
-
-	log.Debug().Msg("listener shutting down")
-	l.doneWg.Done()
 }
 
 func (l *Listener) Wait() {