fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-22 21:41:32 +00:00
Code Issues Projects Releases Wiki Activity

Stop access to global vars. Not configurable.

Browse Source 
After considering the interaction between ability to delcare globals in
scripts using the 'global' function, and the complexities related to
hanlding replication and AOF in a sane way with globals AND ability to
turn protection On and Off, we reconsidered the design. The new design
makes clear that there is only one good way to write Redis scripts, that
is not using globals. In the rare cases state must be retained across
calls a Redis key can be used.
This commit is contained in:
antirez
2012-04-13 13:26:59 +02:00
parent 6255a5ae66
commit 97cab30993
5 changed files with 4 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/config.c
View File

@ -308,10 +308,6 @@ void loadServerConfigFromString(char *config) {
}
} else if (!strcasecmp(argv[0],"lua-time-limit") && argc == 2) {
server.lua_time_limit = strtoll(argv[1],NULL,10);
} else if (!strcasecmp(argv[0],"lua-protect-globals") && argc == 2) {
if ((server.lua_protect_globals = yesnotoi(argv[1])) == -1) {
err = "argument must be 'yes' or 'no'"; goto loaderr;
}
} else if (!strcasecmp(argv[0],"slowlog-log-slower-than") &&
argc == 2)
{
@ -553,16 +549,6 @@ void configSetCommand(redisClient *c) {
} else if (!strcasecmp(c->argv[2]->ptr,"lua-time-limit")) {
if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt;
server.lua_time_limit = ll;
} else if (!strcasecmp(c->argv[2]->ptr,"lua-protect-globals")) {
int enable = yesnotoi(o->ptr);
if (enable == -1) goto badfmt;
if (enable == 0 && server.lua_protect_globals == 1) {
scriptingDisableGlobalsProtection(server.lua);
} else if (enable && server.lua_protect_globals == 0) {
scriptingEnableGlobalsProtection(server.lua);
}
server.lua_protect_globals = enable;
} else if (!strcasecmp(c->argv[2]->ptr,"slowlog-log-slower-than")) {
if (getLongLongFromObject(o,&ll) == REDIS_ERR) goto badfmt;
server.slowlog_log_slower_than = ll;
@ -757,7 +743,6 @@ void configGetCommand(redisClient *c) {
config_get_bool_field("rdbcompression", server.rdb_compression);
config_get_bool_field("rdbchecksum", server.rdb_checksum);
config_get_bool_field("activerehashing", server.activerehashing);
config_get_bool_field("lua-protect-globals", server.lua_protect_globals);
/* Everything we can't handle with macros follows. */