lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #573 from hqwrong/pr

Browse Source 
improve snax
This commit is contained in:
云风
2017-02-10 11:43:37 +08:00
committed by GitHub
parent 2e919505f1 f25e396181
commit 521a387271
3 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lualib/snax/interface.lua
View File

@@ -1,8 +1,24 @@
local skynet = require "skynet"
local function dft_loader(path, name, G)
local errlist = {}
for pat in string.gmatch(path,"[^;]+") do
local filename = string.gsub(pat, "?", name)
local f , err = loadfile(filename, "bt", G)
if f then
return f, pat
else
table.insert(errlist, err)
end
end
error(table.concat(errlist, "\n"))
end
return function (name , G, loader)
loader = loader or loadfile
local mainfunc
loader = loader or dft_loader
local mainfunc
local function func_id(id, group)
local tmp = {}
@@ -61,30 +77,11 @@ return function (name , G, loader)
local pattern
do
local path = assert(skynet.getenv "snax" , "please set snax in config file")
local errlist = {}
for pat in string.gmatch(path,"[^;]+") do
local filename = string.gsub(pat, "?", name)
local f , err = loader(filename, "bt", G)
if f then
pattern = pat
mainfunc = f
break
else
table.insert(errlist, err)
end
end
if mainfunc == nil then
error(table.concat(errlist, "\n"))
end
end
local path = assert(skynet.getenv "snax" , "please set snax in config file")
mainfunc, pattern = loader(path, name, G)
setmetatable(G, { __index = env , __newindex = init_system })
local ok, err = pcall(mainfunc)
local ok, err = xpcall(mainfunc, debug.traceback)
setmetatable(G, nil)
assert(ok,err)