diff options
author | 2016-01-27 11:49:35 -0800 | |
---|---|---|
committer | 2016-01-27 11:49:35 -0800 | |
commit | 8b16d145571860c3d9a236b88caea05bc1dc9f08 (patch) | |
tree | b71d35235ed88d4e4efe35822892c0d89bc3c9b6 /src/core | |
parent | 9e08e8b7039b13fa2c8599eadca06bf6b0d33e87 (diff) | |
parent | 6b6982bde37911fbcefa0e6299840d998d600b85 (diff) |
Merge github.com:grpc/grpc into twah
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/surface/init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 19cea4c4f6..e3ab70dba7 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -117,8 +117,10 @@ void grpc_init(void) { grpc_iomgr_init(); grpc_executor_init(); grpc_tracer_init("GRPC_TRACE"); - /* Only initialize census if noone else has. */ - if (census_enabled() == CENSUS_FEATURE_NONE) { + /* Only initialize census if no one else has and some features are + * available. */ + if (census_enabled() == CENSUS_FEATURE_NONE && + census_supported() != CENSUS_FEATURE_NONE) { if (census_initialize(census_supported())) { /* enable all features. */ gpr_log(GPR_ERROR, "Could not initialize census."); } |