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

Try to report source of bad Lua API calls

Browse Source
This commit is contained in:
ioddly 2013-05-22 18:17:58 -05:00
parent 5d0f408d42
commit c3229c33b1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/scripting.c
View File

@ -152,9 +152,20 @@ char *redisProtocolToLuaType_MultiBulk(lua_State *lua, char *reply) {
} }
void luaPushError(lua_State *lua, char *error) { void luaPushError(lua_State *lua, char *error) {
lua_Debug dbg;
lua_newtable(lua); lua_newtable(lua);
lua_pushstring(lua,"err"); lua_pushstring(lua,"err");
lua_pushstring(lua, error);
/* Attempt to figure out where this function was called, if possible */
if(lua_getstack(lua, 1, &dbg) && lua_getinfo(lua, "nSl", &dbg)) {
sds msg = sdscatprintf(sdsempty(), "%s: %d: %s",
dbg.source, dbg.currentline, error);
lua_pushstring(lua, msg);
sdsfree(msg);
} else {
lua_pushstring(lua, error);
}
lua_settable(lua,-3); lua_settable(lua,-3);
} }
@ -866,9 +877,10 @@ void evalGenericCommand(redisClient *c, int evalsha) {
delhook = 1; delhook = 1;
} }
/* At this point whatever this script was never seen before or if it was /* At this point whether this script was never seen before or if it was
* already defined, we can call it. We have zero arguments and expect * already defined, we can call it. We have zero arguments and expect
* a single return value. */ * a single return value. */
err = lua_pcall(lua,0,1,0); err = lua_pcall(lua,0,1,0);
/* Perform some cleanup that we need to do both on error and success. */ /* Perform some cleanup that we need to do both on error and success. */