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

Initialize all Lua scripting related things into scripting.c

Browse Source
This commit is contained in:
antirez
2015-11-05 11:10:46 +01:00
parent 9aa1f94449
commit cd8f19e9ca
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/scripting.c
View File

@ -790,12 +790,26 @@ void scriptingEnableGlobalsProtection(lua_State *lua) {
}
/* Initialize the scripting environment.
* It is possible to call this function to reset the scripting environment
* assuming that we call scriptingRelease() before.
* See scriptingReset() for more information. */
void scriptingInit(void) {
*
* This function is called the first time at server startup with
* the 'setup' argument set to 1.
*
* It can be called again multiple times during the lifetime of the Redis
* process, with 'setup' set to 0, and following a scriptingRelease() call,
* in order to reset the Lua scripting environment.
*
* However it is simpler to just call scriptingReset() that does just that. */
void scriptingInit(int setup) {
lua_State *lua = lua_open();
if (setup) {
server.lua_client = NULL;
server.lua_caller = NULL;
server.lua_timedout = 0;
server.lua_always_replicate_commands = 0; /* Only DEBUG can change it.*/
server.lua_time_limit = LUA_SCRIPT_TIME_LIMIT;
}
luaLoadLibraries(lua);
luaRemoveUnsupportedFunctions(lua);
@ -952,7 +966,7 @@ void scriptingRelease(void) {
void scriptingReset(void) {
scriptingRelease();
scriptingInit();
scriptingInit(0);
}
/* Set an array of Redis String Objects as a Lua array (table) stored into a
@ -1011,6 +1025,15 @@ int redis_math_randomseed (lua_State *L) {
return 0;
}
/* ---------------------------------------------------------------------------
* LDB: Redis Lua debugging facilities
* ------------------------------------------------------------------------- */
/* Enable debug mode of Lua scripts for this client. */
void ldbEnable(client *c) {
c->flags |= CLIENT_LUA_DEBUG;
}
/* ---------------------------------------------------------------------------
* EVAL and SCRIPT commands implementation
* ------------------------------------------------------------------------- */
@ -1331,6 +1354,9 @@ void scriptCommand(client *c) {
server.lua_kill = 1;
addReply(c,shared.ok);
}
} else if (c->argc == 2 && !strcasecmp(c->argv[1]->ptr,"debug")) {
ldbEnable(c);
addReply(c,shared.ok);
} else {
addReplyError(c, "Unknown SCRIPT subcommand or wrong # of args.");
}