aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2018-08-01 12:12:46 -0700
committerGravatar Sree Kuchibhotla <sreek@google.com>2018-08-01 12:12:46 -0700
commit9ce673f86176a203811c0429872a2acf639f5285 (patch)
tree9f7e971266aa2344eb11e6adb1ca66f633da8d2d /src
parentbdd13cb0aef7d3f6dbc467148b4b3158485359eb (diff)
Make resource quota argument optional to the Server constructor
Diffstat (limited to 'src')
-rw-r--r--src/cpp/server/server_builder.cc4
-rw-r--r--src/cpp/server/server_cc.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 0ab3cd0e32..8417c45e64 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -261,9 +261,9 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
}
std::unique_ptr<Server> server(new Server(
- max_receive_message_size_, &args, sync_server_cqs, resource_quota_,
+ max_receive_message_size_, &args, sync_server_cqs,
sync_server_settings_.min_pollers, sync_server_settings_.max_pollers,
- sync_server_settings_.cq_timeout_msec));
+ sync_server_settings_.cq_timeout_msec, resource_quota_));
if (has_sync_methods) {
// This is a Sync server
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 472c5035fc..43e6b27de2 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -382,8 +382,8 @@ Server::Server(
int max_receive_message_size, ChannelArguments* args,
std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
sync_server_cqs,
- grpc_resource_quota* server_rq, int min_pollers, int max_pollers,
- int sync_cq_timeout_msec)
+ int min_pollers, int max_pollers, int sync_cq_timeout_msec,
+ grpc_resource_quota* server_rq = nullptr)
: max_receive_message_size_(max_receive_message_size),
sync_server_cqs_(std::move(sync_server_cqs)),
started_(false),