diff options
author | 2016-05-05 15:54:13 -0700 | |
---|---|---|
committer | 2016-05-05 15:54:13 -0700 | |
commit | 6db0d9698fbb482e75f44edf0836493ca457d628 (patch) | |
tree | d681efbbc95e5008ab536d0aa893a4cbe8313ba1 /src/core/ext | |
parent | 2fc526701e7869a80f1f6fb76abdec61f690dab7 (diff) | |
parent | 5deda3db97828454da88cb2e1d463c9e0dff7263 (diff) |
Merge pull request #6447 from ctiller/import-madness
Temporary fix for plugin initialization problem
Diffstat (limited to 'src/core/ext')
-rw-r--r-- | src/core/ext/client_config/resolver_registry.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/ext/client_config/resolver_registry.c b/src/core/ext/client_config/resolver_registry.c index 07f29bcb27..e7a4abd568 100644 --- a/src/core/ext/client_config/resolver_registry.c +++ b/src/core/ext/client_config/resolver_registry.c @@ -47,7 +47,6 @@ static int g_number_of_resolvers = 0; static char *g_default_resolver_prefix; void grpc_resolver_registry_init(const char *default_resolver_prefix) { - g_number_of_resolvers = 0; g_default_resolver_prefix = gpr_strdup(default_resolver_prefix); } @@ -57,6 +56,13 @@ void grpc_resolver_registry_shutdown(void) { grpc_resolver_factory_unref(g_all_of_the_resolvers[i]); } gpr_free(g_default_resolver_prefix); + // FIXME(ctiller): this should live in grpc_resolver_registry_init, + // however that would have the client_config plugin call this AFTER we start + // registering resolvers from third party plugins, and so they'd never show + // up. + // We likely need some kind of dependency system for plugins.... what form + // that takes is TBD. + g_number_of_resolvers = 0; } void grpc_register_resolver_type(grpc_resolver_factory *factory) { |