Merge branch 'dev' into sconn

This commit is contained in:
Cloud Wu
2014-07-13 11:58:45 +08:00
6 changed files with 106 additions and 9 deletions

View File

@@ -10,5 +10,9 @@ function datacenter.set(...)
return skynet.call("DATACENTER", "lua", "UPDATE", ...)
end
function datacenter.wait(...)
return skynet.call("DATACENTER", "lua", "WAIT", ...)
end
return datacenter

View File

@@ -257,7 +257,7 @@ function skynet.exit()
local address = session_coroutine_address[co]
local self = skynet.self()
if session~=0 and address then
skynet.redirect(self, address, "error", session, "")
skynet.redirect(address, self, "error", session, "")
end
end
c.command("EXIT")