From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Fri, 29 May 2015 16:24:34 +0000 (+0200)
Subject: modules: fixed kmemcached after api change
X-Git-Tag: v1.0.0-beta1~125^2~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=971e1947b7cc31267b7e10f7ec55d1ee519a995c;p=thirdparty%2Fknot-resolver.git

modules: fixed kmemcached after api change
---

diff --git a/daemon/bindings.c b/daemon/bindings.c
index 3c936f605..b20e3a0d6 100644
--- a/daemon/bindings.c
+++ b/daemon/bindings.c
@@ -299,7 +299,7 @@ static int cache_backends(lua_State *L)
 	lua_newtable(L);
 	for (unsigned i = 0; i < registry->len; ++i) {
 		struct storage_api *storage = &registry->at[i];
-		lua_pushboolean(L, storage->api() == engine->resolver.cache.api); /* kr_cache_storage()); */
+		lua_pushboolean(L, storage->api() == engine->resolver.cache.api);
 		lua_setfield(L, -2, storage->prefix);
 	}
 	return 1;
@@ -309,7 +309,7 @@ static int cache_backends(lua_State *L)
 static int cache_count(lua_State *L)
 {
 	struct engine *engine = engine_luaget(L);
-	const namedb_api_t *storage = engine->resolver.cache.api; /* kr_cache_storage(); */
+	const namedb_api_t *storage = engine->resolver.cache.api;
 
 	/* Fetch item count */
 	struct kr_cache_txn txn;
@@ -390,7 +390,6 @@ static int cache_open(lua_State *L)
 	kr_cache_close(&engine->resolver.cache);
 
 	/* Reopen cache */
-	/* kr_cache_storage_set(storage->api); */
 	void *storage_opts = storage->opts_create(conf, cache_size);
 	int ret = kr_cache_open(&engine->resolver.cache, storage->api(), storage_opts, engine->pool);
 	free(storage_opts);
diff --git a/modules/kmemcached/kmemcached.c b/modules/kmemcached/kmemcached.c
index 1ef4461f7..094da5684 100644
--- a/modules/kmemcached/kmemcached.c
+++ b/modules/kmemcached/kmemcached.c
@@ -44,7 +44,7 @@ int kmemcached_deinit(struct kr_module *module)
 {
 	struct engine *engine = module->data;
 	/* It was currently loaded, close cache */
-	if (kr_cache_storage == namedb_memcached_api) {
+	if (engine->resolver.cache.api == namedb_memcached_api()) {
 		kr_cache_close(&engine->resolver.cache);
 	}
 	/* Prevent from loading it again */