lib/nat: Don't hang on draining timer chan (fixes #6908) (#6912)

2020-08-19 16:58:44 +02:00 · 2020-08-19 16:58:44 +02:00 · ce4d149bf5
parent cbbc262161
commit ce4d149bf5
1 changed files with 4 additions and 1 deletions
--- a/lib/nat/service.go
+++ b/lib/nat/service.go
@ -85,7 +85,10 @@ func (s *Service) serve(ctx context.Context) {
 		case <-timer.C:
 		case <-s.processScheduled:
 			if !timer.Stop() {
-				<-timer.C
+				select {
+				case <-timer.C:
+				default:
+				}
 			}
 		case <-ctx.Done():
 			timer.Stop()