diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-04 08:26:53 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-04 08:26:53 -0700 |
| commit | 0df90f049ad8ee0da6e47bbe89650fcf9bee25e2 (patch) | |
| tree | b1804a6021d8d5b636805f6e4f14e6c1a9e962d2 /src/cpp/server | |
| parent | b58de7238981dc5fa3a18db4941bddca75c0d521 (diff) | |
| parent | 82c7fec59c41c7d0be23550169a46848489ba68c (diff) | |
Merge github.com:grpc/grpc into lazy-batches
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 e874892e73..ce173a1ee2 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -489,7 +489,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 05c05c8695..3a408eb23e 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> |