diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-04-01 17:36:15 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-04-01 17:36:15 -0700 |
| commit | c1a32fa46e2c4e0a9990c66445c3079cf47d7c62 (patch) | |
| tree | 764f4926dbae4420ba8b0be2fe1484bc092902f1 /src/cpp/server | |
| parent | 4426800e6c3b8e1c535918166a1e59fea521bfd7 (diff) | |
| parent | bd210c0bff6c8e52f49caa1cbc129359c24e2fbf (diff) | |
Merge branch 'master' into cq_create_api_changes
Diffstat (limited to 'src/cpp/server')
| -rw-r--r-- | src/cpp/server/server_cc.cc | 4 | ||||
| -rw-r--r-- | src/cpp/server/server_context.cc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index f121b481c5..bee359a792 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -502,7 +502,9 @@ void Server::RegisterAsyncGenericService(AsyncGenericService* service) { int Server::AddListeningPort(const grpc::string& addr, ServerCredentials* creds) { GPR_ASSERT(!started_); - return creds->AddPortToServer(addr, server_); + int port = creds->AddPortToServer(addr, server_); + global_callbacks_->AddPort(this, port); + return port; } bool Server::Start(ServerCompletionQueue** cqs, size_t num_cqs) { diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 01e9c00434..afc9873c14 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -42,6 +42,7 @@ #include <grpc++/support/time.h> #include <grpc/compression.h> #include <grpc/grpc.h> +#include <grpc/load_reporting.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> |