Merge pull request #46 from bigbes/gh-44-expiration-error

Error on expiration fiber start while under tarantoolctl
tarantool · Oct 15, 2018 · 18409a1 · 18409a1
2 parents b5d0ff5 + 911e579
commit 18409a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/memcached/init.lua b/memcached/init.lua
@@ -8,7 +8,9 @@ local log    = require('log')
 
 local fmt = string.format
 
-ffi.load(package.searchpath('memcached.internal', package.cpath), true)
+local internal_so_path = package.search('memcached.internal')
+assert(internal_so_path, "Failed to find memcached/internal.so library")
+ffi.load(internal_so_path, true)
 
 ffi.cdef[[
 struct memcached_stat {

diff --git a/memcached/internal/expiration.c b/memcached/internal/expiration.c
@@ -108,6 +108,7 @@ memcached_expire_start(struct memcached_service *p)
 	struct fiber *expire_fiber = NULL;
 	char name[128];
 	snprintf(name, 128, "__mc_%s_expire", p->name);
+	box_error_clear();
 	expire_fiber = fiber_new(name, memcached_expire_loop);
 	const box_error_t *err = box_error_last();
 	if (err) {