diff options
author | Mark D. Roth <roth@google.com> | 2016-09-06 10:44:32 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-09-06 10:44:32 -0700 |
commit | 7bfa1a83433db3766aa46a0f373051ab69d1a2c4 (patch) | |
tree | ef79704fa28fee2f0fb81f870f177e68b5236610 /src/cpp | |
parent | c99fd89d32d8b74791ea0aed1b0e72eed85db85d (diff) | |
parent | d57bbe7f8fda6d6146f47319db319610ec908e48 (diff) |
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
Diffstat (limited to 'src/cpp')
-rw-r--r-- | src/cpp/server/server_builder.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 1f6e74938d..960ebd640d 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -35,10 +35,9 @@ #include <grpc++/impl/service_type.h> #include <grpc++/server.h> -#include <grpc/support/cpu.h> #include <grpc/support/log.h> +#include <grpc/support/useful.h> -#include "include/grpc/support/useful.h" #include "src/cpp/server/thread_pool_interface.h" namespace grpc { @@ -156,14 +155,12 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { (*option)->UpdateArguments(&args); (*option)->UpdatePlugins(&plugins_); } - if (!thread_pool) { - for (auto plugin = plugins_.begin(); plugin != plugins_.end(); plugin++) { - if ((*plugin)->has_sync_methods()) { - thread_pool.reset(CreateDefaultThreadPool()); - has_sync_methods = true; - break; - } + for (auto plugin = plugins_.begin(); plugin != plugins_.end(); plugin++) { + if (!thread_pool && (*plugin)->has_sync_methods()) { + thread_pool.reset(CreateDefaultThreadPool()); + has_sync_methods = true; } + (*plugin)->UpdateChannelArguments(&args); } if (max_receive_message_size_ > 0) { args.SetInt(GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH, max_receive_message_size_); |