diff options
author | 2015-06-02 16:55:54 -0700 | |
---|---|---|
committer | 2015-06-02 16:55:54 -0700 | |
commit | a4b89fed1c801cdb31a154c7e1c09e5650898e8a (patch) | |
tree | d0a00563db8df1da5d69dee362664a85112f20cb /src/core/surface/init.c | |
parent | aaa03d74ceae4d48e31f4ba0619e359acd21505a (diff) | |
parent | c86b1dd59d1e61b9377f2dca0741061b2e5de1da (diff) |
Merge github.com:grpc/grpc into you-complete-me
Conflicts:
src/core/iomgr/resolve_address_posix.c
src/core/surface/server.c
Diffstat (limited to 'src/core/surface/init.c')
-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 d6eb9b2c24..ac6871c6f2 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -31,11 +31,11 @@ * */ +#include <grpc/census.h> #include <grpc/grpc.h> #include "src/core/channel/channel_stack.h" #include "src/core/debug/trace.h" #include "src/core/iomgr/iomgr.h" -#include "src/core/statistics/census_interface.h" #include "src/core/profiling/timers.h" #include "src/core/surface/call.h" #include "src/core/surface/init.h" @@ -64,7 +64,9 @@ void grpc_init(void) { grpc_security_pre_init(); grpc_iomgr_init(); grpc_tracer_init("GRPC_TRACE"); - census_init(); + if (census_initialize(CENSUS_NONE)) { + gpr_log(GPR_ERROR, "Could not initialize census."); + } grpc_timers_global_init(); } gpr_mu_unlock(&g_init_mu); |