lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 04:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

add skynet.pcall for hotfix use (call a function with require)

Browse Source
This commit is contained in:
Cloud Wu
2015-04-22 16:50:20 +08:00
parent e3b7f86075
commit cd3391461c
7 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lualib/skynet.lua
View File

@@ -620,8 +620,10 @@ end
local function init_all()
local funcs = init_func
init_func = nil
for k,v in pairs(funcs) do
v()
if funcs then
for k,v in pairs(funcs) do
v()
end
end
end
@@ -632,8 +634,12 @@ local function init_template(start)
init_all()
end
function skynet.pcall(start)
return xpcall(init_template, debug.traceback, start)
end
local function init_service(start)
local ok, err = xpcall(init_template, debug.traceback, start)
local ok, err = skynet.pcall(start)
if not ok then
skynet.error("init service failed: " .. tostring(err))
skynet.send(".launcher","lua", "ERROR")