Move error checking further up (#34)

siderolabs · Oct 17, 2018 · 0f1106e · 0f1106e
1 parent d5b35f6
commit 0f1106e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/proxy/handler.go b/proxy/handler.go
@@ -65,10 +65,11 @@ func (s *handler) handler(srv interface{}, serverStream grpc.ServerStream) error
 	}
 	// We require that the director's returned context inherits from the serverStream.Context().
 	outgoingCtx, backendConn, err := s.director(serverStream.Context(), fullMethodName)
-	clientCtx, clientCancel := context.WithCancel(outgoingCtx)
 	if err != nil {
 		return err
 	}
+
+	clientCtx, clientCancel := context.WithCancel(outgoingCtx)
 	// TODO(mwitkow): Add a `forwarded` header to metadata, https://en.wikipedia.org/wiki/X-Forwarded-For.
 	clientStream, err := grpc.NewClientStream(clientCtx, clientStreamDescForProxying, backendConn, fullMethodName)
 	if err != nil {