From ec82dbae39003892114c4207595154a029b4d2d0 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 19 Mar 2019 15:05:54 -0700 Subject: [PATCH 1/2] Add the actual peer in the error message --- src/core/lib/surface/call.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index d53eb704420..ccb37c51641 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -1035,9 +1035,15 @@ static void recv_trailing_filter(void* args, grpc_metadata_batch* b, grpc_get_status_code_from_metadata(b->idx.named.grpc_status->md); grpc_error* error = GRPC_ERROR_NONE; if (status_code != GRPC_STATUS_OK) { - error = grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("Error received from peer"), - GRPC_ERROR_INT_GRPC_STATUS, static_cast(status_code)); + char* peer_msg = nullptr; + char* peer = grpc_call_get_peer(call); + gpr_asprintf(&peer_msg, "Error received from peer %s", + grpc_call_get_peer(call)); + error = grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(peer_msg), + GRPC_ERROR_INT_GRPC_STATUS, + static_cast(status_code)); + gpr_free(peer); + gpr_free(peer_msg); } if (b->idx.named.grpc_message != nullptr) { error = grpc_error_set_str( From 2c6849af7bf1929b196d8e337954d45b5f0df41c Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 19 Mar 2019 15:49:17 -0700 Subject: [PATCH 2/2] s/peer/grpc_call_get_peer --- src/core/lib/surface/call.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index ccb37c51641..8aaff4a67d5 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -1037,8 +1037,7 @@ static void recv_trailing_filter(void* args, grpc_metadata_batch* b, if (status_code != GRPC_STATUS_OK) { char* peer_msg = nullptr; char* peer = grpc_call_get_peer(call); - gpr_asprintf(&peer_msg, "Error received from peer %s", - grpc_call_get_peer(call)); + gpr_asprintf(&peer_msg, "Error received from peer %s", peer); error = grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(peer_msg), GRPC_ERROR_INT_GRPC_STATUS, static_cast(status_code));