diff options
author | 2018-10-04 15:17:50 -0700 | |
---|---|---|
committer | 2018-10-04 15:17:50 -0700 | |
commit | cfe47deca438844140590ed44f23b3b80aa4cc1f (patch) | |
tree | 719d641534ab33d12ab0925418c15a031d73dac9 /src/core/lib/surface/server.cc | |
parent | 8362e7042d4c7d41c756d85b4e64d499ae4e52ed (diff) | |
parent | fbbf4593d69823b1a3d75e910c714a783116648f (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-server-sockets
Diffstat (limited to 'src/core/lib/surface/server.cc')
-rw-r--r-- | src/core/lib/surface/server.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index 54f921b0c2..5482319f79 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -1009,11 +1009,11 @@ grpc_server* grpc_server_create(const grpc_channel_args* args, void* reserved) { server->channel_args = grpc_channel_args_copy(args); const grpc_arg* arg = grpc_channel_args_find(args, GRPC_ARG_ENABLE_CHANNELZ); - if (grpc_channel_arg_get_bool(arg, false)) { + if (grpc_channel_arg_get_bool(arg, GRPC_ENABLE_CHANNELZ_DEFAULT)) { arg = grpc_channel_args_find(args, GRPC_ARG_MAX_CHANNEL_TRACE_EVENTS_PER_NODE); - size_t trace_events_per_node = - grpc_channel_arg_get_integer(arg, {0, 0, INT_MAX}); + size_t trace_events_per_node = grpc_channel_arg_get_integer( + arg, {GRPC_MAX_CHANNEL_TRACE_EVENTS_PER_NODE_DEFAULT, 0, INT_MAX}); server->channelz_server = grpc_core::MakeRefCounted<grpc_core::channelz::ServerNode>( server, trace_events_per_node); |