From 1051d9383773f26b5a56dc1380006c841b7d59a8 Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 10 Sep 2018 17:09:01 +0200 Subject: [PATCH] Slave removal: scripting.c logs and other stuff fixed. --- src/scripting.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/scripting.c b/src/scripting.c index acea551e..73337c71 100644 --- a/src/scripting.c +++ b/src/scripting.c @@ -777,7 +777,7 @@ int luaRedisSetReplCommand(lua_State *lua) { flags = lua_tonumber(lua,-1); if ((flags & ~(PROPAGATE_AOF|PROPAGATE_REPL)) != 0) { - lua_pushstring(lua, "Invalid replication flags. Use REPL_AOF, REPL_SLAVE, REPL_ALL or REPL_NONE."); + lua_pushstring(lua, "Invalid replication flags. Use REPL_AOF, REPL_REPLICA, REPL_ALL or REPL_NONE."); return lua_error(lua); } server.lua_repl = flags; @@ -998,6 +998,10 @@ void scriptingInit(int setup) { lua_pushnumber(lua,PROPAGATE_REPL); lua_settable(lua,-3); + lua_pushstring(lua,"REPL_REPLICA"); + lua_pushnumber(lua,PROPAGATE_REPL); + lua_settable(lua,-3); + lua_pushstring(lua,"REPL_ALL"); lua_pushnumber(lua,PROPAGATE_AOF|PROPAGATE_REPL); lua_settable(lua,-3); @@ -1484,7 +1488,7 @@ void scriptCommand(client *c) { const char *help[] = { "DEBUG (yes|sync|no) -- Set the debug mode for subsequent scripts executed.", "EXISTS [ ...] -- Return information about the existence of the scripts in the script cache.", -"FLUSH -- Flush the Lua scripts cache. Very dangerous on slaves.", +"FLUSH -- Flush the Lua scripts cache. Very dangerous on replicas.", "KILL -- Kill the currently executing Lua script.", "LOAD