aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpcpp
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2018-10-17 12:51:17 -0700
committerGravatar Yash Tibrewal <yashkt@google.com>2018-10-17 12:51:17 -0700
commit196f530ac91812886f96de8642ed4fc709a3162c (patch)
treef985457c0fe9d9f2e0fa56757e1184100935ad16 /include/grpcpp
parentaf621c7705939dc64af8f5098dbad8d9faace82d (diff)
Pass interceptor creators to server object
Diffstat (limited to 'include/grpcpp')
-rw-r--r--include/grpcpp/server.h9
-rw-r--r--include/grpcpp/server_builder.h8
2 files changed, 11 insertions, 6 deletions
diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h
index 8d3e856502..27d1ec0cfa 100644
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@@ -174,7 +174,11 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
sync_server_cqs,
int min_pollers, int max_pollers, int sync_cq_timeout_msec,
- grpc_resource_quota* server_rq = nullptr);
+ grpc_resource_quota* server_rq = nullptr,
+ std::vector<
+ std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>
+ interceptor_creators = std::vector<std::unique_ptr<
+ experimental::ServerInterceptorFactoryInterface>>());
/// Start the server.
///
@@ -251,6 +255,9 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
// A special handler for resource exhausted in sync case
std::unique_ptr<internal::MethodHandler> resource_exhausted_handler_;
+
+ std::vector<std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>
+ interceptor_creators_;
};
} // namespace grpc
diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h
index 4cbcac3532..028b8cffaa 100644
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@@ -221,12 +221,10 @@ class ServerBuilder {
explicit experimental_type(ServerBuilder* builder) : builder_(builder) {}
void SetInterceptorCreators(
- std::unique_ptr<std::vector<
- std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>>
+ std::vector<
+ std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>
interceptor_creators) {
- if (interceptor_creators != nullptr) {
- builder_->interceptor_creators_ = std::move(*interceptor_creators);
- }
+ builder_->interceptor_creators_ = std::move(interceptor_creators);
}
private: