Merge pull request #98 from Sh4d1/fix_panic_no_backend

k8s-ci-robot · web-flow · commit 70a5a5a7376c · 2020-03-26T10:14:25.000-07:00
add a missing return on error
diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go
@@ -77,6 +77,7 @@ func (t *Tunnel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	backend, err := t.Server.BackendManager.Backend()
 	if err != nil {
 		http.Error(w, fmt.Sprintf("currently no tunnels available: %v", err), http.StatusInternalServerError)
+		return
 	}
 	if err := backend.Send(dialRequest); err != nil {
 		klog.Errorf("failed to tunnel dial request %v", err)

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ func (t Tunnel) ServeHTTP(w http.ResponseWriter, r http.Request) {`
`77`	`77`	`backend, err := t.Server.BackendManager.Backend()`
`78`	`78`	`if err != nil {`
`79`	`79`	`http.Error(w, fmt.Sprintf("currently no tunnels available: %v", err), http.StatusInternalServerError)`
	`80`	`+ return`
`80`	`81`	`}`
`81`	`82`	`if err := backend.Send(dialRequest); err != nil {`
`82`	`83`	`klog.Errorf("failed to tunnel dial request %v", err)`