fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-18 16:40:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3294 from yossigo/fix_unload

Browse Source 
Fix MODULE UNLOAD crash and/or wrong error message.
This commit is contained in:
Salvatore Sanfilippo 2016-06-10 10:18:49 +02:00 committed by GitHub
commit b4327ae5fe
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/module.c
View File

@ -2956,13 +2956,13 @@ int moduleLoad(const char *path) {
int moduleUnload(sds name) {
struct RedisModule *module = dictFetchValue(modules,name);
if (listLength(module->types)) {
errno = EBUSY;
if (module == NULL) {
errno = ENOENT;
return REDISMODULE_ERR;
}
if (module == NULL) {
errno = ENOENT;
if (listLength(module->types)) {
errno = EBUSY;
return REDISMODULE_ERR;
}
@ -3020,10 +3020,17 @@ void moduleCommand(client *c) {
if (moduleUnload(c->argv[2]->ptr) == C_OK)
addReply(c,shared.ok);
else {
char *errmsg = "operation not possible.";
char *errmsg;
switch(errno) {
case ENOENT: errmsg = "no such module with that name";
case EBUSY: errmsg = "the module exports one or more module-side data types, can't unload";
case ENOENT:
errmsg = "no such module with that name";
break;
case EBUSY:
errmsg = "the module exports one or more module-side data types, can't unload";
break;
default:
errmsg = "operation not possible.";
break;
}
addReplyErrorFormat(c,"Error unloading module: %s",errmsg);
}