From b1a80c751d99996bc3e48390081b3b0dfcfbc4e0 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Tue, 9 May 2017 16:50:54 -0700
Subject: [PATCH] bug fixes
---
include/grpc/impl/codegen/grpc_types.h | 2 +-
src/cpp/server/server_builder.cc | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index a183e1382d..37452e24c5 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -297,7 +297,7 @@ each time recvmsg (or equivalent) is called */
If 0 or unset, the balancer calls will have no deadline. */
#define GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS "grpc.grpclb_timeout_ms"
/** If non-zero, grpc server's cronet compression workaround will be enabled */
-#define GRPC_ARG_WORKAROUND_CRONET_COMPRESSION "grpc.socket_factory"
+#define GRPC_ARG_WORKAROUND_CRONET_COMPRESSION "grpc.workaround.cronet_compression"
/** \} */
/** Result of a grpc call. If the caller satisfies the prerequisites of a
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 67a7846da5..92aa30c240 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -363,7 +363,7 @@ void ServerBuilder::InternalAddPluginFactory(
(*g_plugin_factory_list).push_back(CreatePlugin);
}
-void ServerBuilder::EnableWorkaround(uint32_t id) {
+ServerBuilder& ServerBuilder::EnableWorkaround(uint32_t id) {
switch (id) {
case GRPC_WORKAROUND_ID_CRONET_COMPRESSION:
enabled_workarounds_.push_back(GRPC_ARG_WORKAROUND_CRONET_COMPRESSION);
@@ -371,6 +371,8 @@ void ServerBuilder::EnableWorkaround(uint32_t id) {
default:
gpr_log(GPR_ERROR, "Workaround %u is not exist or obsolete.", id);
}
+
+ return *this;
}
} // namespace grpc
--
GitLab