diff --git a/examples/checkdeadloop.lua b/examples/checkdeadloop.lua index 46f395c1..d9648666 100644 --- a/examples/checkdeadloop.lua +++ b/examples/checkdeadloop.lua @@ -8,7 +8,7 @@ local function timeout_check(ti) end skynet.sleep(ti) -- sleep 10 sec for k,v in pairs(list) do - skynet.error("timout",ti,k,v) + skynet.error("timeout",ti,k,v) end end diff --git a/lualib-src/lua-cluster.c b/lualib-src/lua-cluster.c index a1f32202..9aba8be1 100644 --- a/lualib-src/lua-cluster.c +++ b/lualib-src/lua-cluster.c @@ -265,7 +265,7 @@ unpackreq_number(lua_State *L, const uint8_t * buf, int sz) { return_buffer(L, (const char *)buf+9, sz-9); if (session == 0) { lua_pushnil(L); - lua_pushboolean(L,1); // is_push, no reponse + lua_pushboolean(L,1); // is_push, no response return 6; } @@ -326,7 +326,7 @@ unpackreq_string(lua_State *L, const uint8_t * buf, int sz) { return_buffer(L, (const char *)buf+2+namesz+4, sz - namesz - 6); if (session == 0) { lua_pushnil(L); - lua_pushboolean(L,1); // is_push, no reponse + lua_pushboolean(L,1); // is_push, no response return 6; } diff --git a/service/clusterd.lua b/service/clusterd.lua index 44729966..82b19f5c 100644 --- a/service/clusterd.lua +++ b/service/clusterd.lua @@ -67,9 +67,9 @@ local function open_channel(t, key) -- no sender or closed, always succ succ = true else - -- trun off the sender + -- turn off the sender succ, err = pcall(skynet.call, c, "lua", "changenode", false) - if succ then --trun off failed, wait next index todo turn off + if succ then --turn off failed, wait next index todo turn off node_sender_closed[key] = true end end @@ -118,7 +118,7 @@ local function loadconfig(tmp) end local ct = connecting[name] if ct and ct.namequery and not config.nowaiting then - skynet.error(string.format("Cluster node [%s] resloved : %s", name, address)) + skynet.error(string.format("Cluster node [%s] resolved : %s", name, address)) skynet.wakeup(ct.namequery) end end diff --git a/test/testtimer.lua b/test/testtimer.lua index 2ca2cbe0..2746bffc 100644 --- a/test/testtimer.lua +++ b/test/testtimer.lua @@ -25,7 +25,7 @@ local function test() end skynet.start(function() - skynet.trace_timeout(true) -- trun on trace for timeout, skynet.task will returns more info. + skynet.trace_timeout(true) -- turn on trace for timeout, skynet.task will returns more info. test() skynet.fork(wakeup, coroutine.running())