diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-05-12 12:25:43 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-12 12:25:43 -0700 |
| commit | 04f97ca02282cd57fdc65fe798f94feb94c2d554 (patch) | |
| tree | f9f638167c2116a57bd65434c172853f78d7da7f /src/cpp/server | |
| parent | c8a6822b0e0afa53b2ec4c92610f7175e4be5127 (diff) | |
| parent | a2d9d48a888bf9162d1288496e60920b481bf3eb (diff) | |
Merge branch 'master' into backward-compat-dev
Diffstat (limited to 'src/cpp/server')
| -rw-r--r-- | src/cpp/server/server_cc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index b4d6961db8..7c93bb8683 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -521,7 +521,7 @@ void Server::Start(ServerCompletionQueue** cqs, size_t num_cqs) { if (health_check_service_ == nullptr && !health_check_service_disabled_ && DefaultHealthCheckServiceEnabled()) { if (sync_server_cqs_->empty()) { - gpr_log(GPR_ERROR, + gpr_log(GPR_INFO, "Default health check service disabled at async-only server."); } else { auto* default_hc_service = new DefaultHealthCheckService; @@ -686,6 +686,7 @@ bool ServerInterface::GenericAsyncRequest::FinalizeResult(void** tag, StringFromCopiedSlice(call_details_.method); static_cast<GenericServerContext*>(context_)->host_ = StringFromCopiedSlice(call_details_.host); + context_->deadline_ = call_details_.deadline; } grpc_slice_unref(call_details_.method); grpc_slice_unref(call_details_.host); |