diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-05-09 17:12:24 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-05-09 17:12:24 -0700 |
| commit | f5b3db9c224a30b348acac88b379f5bea891808b (patch) | |
| tree | 8d9f9161c20621900639b7f380d956b5ad8c473b | |
| parent | b1a80c751d99996bc3e48390081b3b0dfcfbc4e0 (diff) | |
Use AddChannelArgument method
| -rw-r--r-- | include/grpc++/server_builder.h | 1 | ||||
| -rw-r--r-- | src/cpp/server/server_builder.cc | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/grpc++/server_builder.h b/include/grpc++/server_builder.h index 7d34592dbb..ca9ea1bcfc 100644 --- a/include/grpc++/server_builder.h +++ b/include/grpc++/server_builder.h @@ -231,7 +231,6 @@ class ServerBuilder { std::vector<std::unique_ptr<ServerBuilderOption>> options_; std::vector<std::unique_ptr<NamedService>> services_; std::vector<Port> ports_; - std::vector<const char *> enabled_workarounds_; SyncServerSettings sync_server_settings_; diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 92aa30c240..1da7836e45 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -199,10 +199,6 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { args.SetInt(GRPC_ARG_MAX_SEND_MESSAGE_LENGTH, max_send_message_size_); } - for (auto workaround : enabled_workarounds_) { - args.SetInt(workaround, 1); - } - args.SetInt(GRPC_COMPRESSION_CHANNEL_ENABLED_ALGORITHMS_BITSET, enabled_compression_algorithms_bitset_); if (maybe_default_compression_level_.is_set) { @@ -366,13 +362,11 @@ void ServerBuilder::InternalAddPluginFactory( ServerBuilder& ServerBuilder::EnableWorkaround(uint32_t id) { switch (id) { case GRPC_WORKAROUND_ID_CRONET_COMPRESSION: - enabled_workarounds_.push_back(GRPC_ARG_WORKAROUND_CRONET_COMPRESSION); - break; + return AddChannelArgument(GRPC_ARG_WORKAROUND_CRONET_COMPRESSION, 1); default: - gpr_log(GPR_ERROR, "Workaround %u is not exist or obsolete.", id); + gpr_log(GPR_ERROR, "Workaround %u does not exist or obsolete.", id); + return *this; } - - return *this; } } // namespace grpc |