diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-10 15:16:14 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-08 09:08:22 -0800 |
| commit | 12352b2c5c4f1876586fec8148d4b2405d0c7e36 (patch) | |
| tree | ee74648399c2d4a073dcd0b5a6a83790f43804d4 /src/cpp/server | |
| parent | 4751c28b0b371eaa6fd17583e06e740989b62b86 (diff) | |
Add test of server builder, including channel args
Diffstat (limited to 'src/cpp/server')
| -rw-r--r-- | src/cpp/server/server_builder.cc | 8 | ||||
| -rw-r--r-- | src/cpp/server/server_cc.cc | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 00a90bb184..4eb4b5a1b2 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -323,9 +323,14 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { } } + bool added_port = false; for (auto port = ports_.begin(); port != ports_.end(); port++) { int r = server->AddListeningPort(port->addr, port->creds.get()); - if (!r) return nullptr; + if (!r) { + if (added_port) server->Shutdown(); + return nullptr; + } + added_port = true; if (port->selected_port != nullptr) { *port->selected_port = r; } @@ -333,6 +338,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { auto cqs_data = cqs_.empty() ? nullptr : &cqs_[0]; if (!server->Start(cqs_data, cqs_.size())) { + if (added_port) server->Shutdown(); return nullptr; } diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 9e11a8a9e0..e874892e73 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -534,7 +534,7 @@ bool Server::Start(ServerCompletionQueue** cqs, size_t num_cqs) { void Server::ShutdownInternal(gpr_timespec deadline) { std::unique_lock<std::mutex> lock(mu_); - if (started_ && !shutdown_) { + if (!shutdown_) { shutdown_ = true; /// The completion queue to use for server shutdown completion notification |