From: antirez Date: Tue, 25 Oct 2011 17:54:10 +0000 (+0200) Subject: Don't timeout scripts if the instance is a slave. X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/e089e61019a4d59eacb6340f0c58dc7bf3b61fd3 Don't timeout scripts if the instance is a slave. --- diff --git a/src/scripting.c b/src/scripting.c index 18a0a81e..d1e85e26 100644 --- a/src/scripting.c +++ b/src/scripting.c @@ -606,7 +606,7 @@ void evalGenericCommand(redisClient *c, int evalsha) { * is running for too much time. * We set the hook only if the time limit is enabled as the hook will * make the Lua script execution slower. */ - if (server.lua_time_limit > 0) { + if (server.lua_time_limit > 0 && server.masterhost != NULL) { lua_sethook(lua,luaMaskCountHook,LUA_MASKCOUNT,100000); server.lua_time_start = ustime()/1000; } else {