[executor] Do not cause executor disconnect on unprocessable MESSAGE

Author: teo

executor/executor.go

@@ -271,9 +271,10 @@ func buildEventHandler(state *internalState) events.Handler {
 				Trace("received message data")
 			err := handleMessageEvent(state, e.Message.Data)
 			if err != nil {
-				log.WithField("error", err.Error()).Debug("MESSAGE handler error")
+				log.WithField("error", err.Error()).
+					Debug("incoming MESSAGE handler error")
 			}
-			return err
+			return nil // failed message handler (e.g. no such task) shouldn't cause an executor disconnect
 		},
 		executor.Event_SHUTDOWN: func(_ context.Context, e *executor.Event) error {
 			log.WithField("event", e.Type.String()).Trace("handling event")

executor/handlers.go

@@ -116,7 +116,7 @@ func handleMessageEvent(state *internalState, data []byte) (err error) {
 				response.ErrorString = err.Error()
 			}
 
-			data, marshalError := json.Marshal(response)
+			jsonData, marshalError := json.Marshal(response)
 			if marshalError != nil {
 				if response.Err() != nil {
 					log.WithFields(logrus.Fields{
@@ -137,7 +137,7 @@ func handleMessageEvent(state *internalState, data []byte) (err error) {
 				return
 			}
 
-			_, _ = state.cli.Send(context.TODO(), calls.NonStreaming(calls.Message(data)))
+			_, _ = state.cli.Send(context.TODO(), calls.NonStreaming(calls.Message(jsonData)))
 			if response.Err() != nil {
 				log.WithFields(logrus.Fields{
 					"commandName": response.GetCommandName(),
@@ -191,7 +191,7 @@ func handleMessageEvent(state *internalState, data []byte) (err error) {
 
 			response := activeTask.Transition(cmd)
 
-			data, marshalError := json.Marshal(response)
+			jsonData, marshalError := json.Marshal(response)
 			if marshalError != nil {
 				if response.Err() != nil {
 					log.WithFields(logrus.Fields{
@@ -212,7 +212,7 @@ func handleMessageEvent(state *internalState, data []byte) (err error) {
 				return
 			}
 
-			_, _ = state.cli.Send(context.TODO(), calls.NonStreaming(calls.Message(data)))
+			_, _ = state.cli.Send(context.TODO(), calls.NonStreaming(calls.Message(jsonData)))
 			if response.Err() != nil {
 				log.WithFields(logrus.Fields{
 					"commandName": response.GetCommandName(),