Maintenance: prevent exit race condition for loops

2021-06-10 14:13:08 +00:00
parent fb7fdcd925
commit 05c6b9379a
3 changed files with 16 additions and 0 deletions
--- a/internal/dns/loop.go
+++ b/internal/dns/loop.go
@@ -159,6 +159,11 @@ func (l *looper) Run(ctx context.Context, done chan<- struct{}) {
 				stayHere = false
 			case err := <-waitError: // unexpected error
 				unboundCancel()
+				if ctx.Err() != nil {
+					close(waitError)
+					closeStreams()
+					return
+				}
 				l.state.setStatusWithLock(constants.Crashed)
 				const fallback = true
 				l.useUnencryptedDNS(fallback)