Merge c66f687 into 865e39c

uber · Oct 22, 2018 · 7f3ec56 · 7f3ec56
2 parents 865e39c + c66f687
commit 7f3ec56
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/runtime/tchannel_server.go b/runtime/tchannel_server.go
@@ -396,7 +396,9 @@ func (c *tchannelInboundCall) handle(ctx context.Context, wireValue *wire.Value)
 	}
 	if err != nil {
 		LogErrorWarnTimeoutContext(c.ctx, c.endpoint.contextLogger, err, "Unexpected tchannel system error")
-		err = c.call.Response().SendSystemError(errors.New("Server Error"))
+		if er := c.call.Response().SendSystemError(errors.New("Server Error")); er != nil {
+			LogErrorWarnTimeoutContext(c.ctx, c.endpoint.contextLogger, err, "Error sending server error response")
+		}
 		return
 	}
 	if !c.success {