Skip to content

Commit 8807a74

Browse files
committed
Always send compile response even in case of error
1 parent ee1378c commit 8807a74

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

commands/daemon/daemon.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -268,18 +268,19 @@ func (s *ArduinoCoreServerImpl) LoadSketch(ctx context.Context, req *rpc.LoadSke
268268
func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.ArduinoCoreService_CompileServer) error {
269269
outStream, outCtx := utils.FeedStreamTo(func(data []byte) { stream.Send(&rpc.CompileResponse{OutStream: data}) })
270270
errStream, errCtx := utils.FeedStreamTo(func(data []byte) { stream.Send(&rpc.CompileResponse{ErrStream: data}) })
271-
resp, err := compile.Compile(
271+
compileResp, compileErr := compile.Compile(
272272
stream.Context(), req, outStream, errStream,
273273
func(p *rpc.TaskProgress) { stream.Send(&rpc.CompileResponse{Progress: p}) },
274274
false) // Set debug to false
275275
outStream.Close()
276276
errStream.Close()
277-
if err != nil {
278-
return convertErrorToRPCStatus(err)
279-
}
280277
<-outCtx.Done()
281278
<-errCtx.Done()
282-
return stream.Send(resp)
279+
compileRespSendErr := stream.Send(compileResp)
280+
if compileErr != nil {
281+
return convertErrorToRPCStatus(compileErr)
282+
}
283+
return compileRespSendErr
283284
}
284285

285286
// PlatformInstall FIXMEDOC

0 commit comments

Comments
 (0)