Don't timeout scripts if the instance is a slave.

diff --git a/src/scripting.c b/src/scripting.c
index 18a0a81ed87678d961291d49e2ad1e00243cb674..d1e85e26d6d429a82e817577de79fb30d4bd6c34 100644 (file)
--- 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 {