TUN-2823: Bugfix. cloudflared would hang forever if error occurred.

2020-03-19 17:48:42 -05:00 · 2020-03-19 17:48:42 -05:00 · 32df01a9da
parent 6dcf3a4cbc
commit 32df01a9da
1 changed files with 7 additions and 2 deletions
--- a/origin/tunnel.go
+++ b/origin/tunnel.go
@ -323,8 +323,13 @@ func ServeTunnel(
 	})

 	errGroup.Go(func() error {
-		<-reconnectCh
-		return fmt.Errorf("received disconnect signal")
+		select {
+		case <-reconnectCh:
+			return fmt.Errorf("received disconnect signal")
+		case <-serveCtx.Done():
+			return nil
+		}
+
 	})

 	errGroup.Go(func() error {