diff --git a/lualib/snax/interface.lua b/lualib/snax/interface.lua index 07c1b728..5a403cfd 100644 --- a/lualib/snax/interface.lua +++ b/lualib/snax/interface.lua @@ -1,24 +1,23 @@ local skynet = require "skynet" local function dft_loader(path, name, G) - local errlist = {} + 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 + 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")) + error(table.concat(errlist, "\n")) end return function (name , G, loader) - loader = loader or dft_loader - local mainfunc + loader = loader or dft_loader local function func_id(id, group) local tmp = {} @@ -42,7 +41,6 @@ return function (name , G, loader) assert(getmetatable(G) == nil) assert(G.init == nil) assert(G.exit == nil) - assert(G.accept == nil) assert(G.response == nil) end @@ -75,10 +73,8 @@ return function (name , G, loader) end end - local pattern - - local path = assert(skynet.getenv "snax" , "please set snax in config file") - mainfunc, pattern = loader(path, name, G) + local path = assert(skynet.getenv "snax" , "please set snax in config file") + local mainfunc, pattern = loader(path, name, G) setmetatable(G, { __index = env , __newindex = init_system }) local ok, err = xpcall(mainfunc, debug.traceback)