Move error checking further up (#34)

rubensf · bwplotka · commit 0f1106ef9c76 · 2018-10-17T17:41:39.000+01:00
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 {

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,11 @@ func (s *handler) handler(srv interface{}, serverStream grpc.ServerStream) error`
`65`	`65`	`}`
`66`	`66`	`// We require that the director's returned context inherits from the serverStream.Context().`
`67`	`67`	`outgoingCtx, backendConn, err := s.director(serverStream.Context(), fullMethodName)`
`68`		`- clientCtx, clientCancel := context.WithCancel(outgoingCtx)`
`69`	`68`	`if err != nil {`
`70`	`69`	`return err`
`71`	`70`	`}`
	`71`	`+`
	`72`	`+ clientCtx, clientCancel := context.WithCancel(outgoingCtx)`
`72`	`73`	// TODO(mwitkow): Add a `forwarded` header to metadata, https://en.wikipedia.org/wiki/X-Forwarded-For.
`73`	`74`	`clientStream, err := grpc.NewClientStream(clientCtx, clientStreamDescForProxying, backendConn, fullMethodName)`
`74`	`75`	`if err != nil {`