Uniform indent to tab and clear up.

This commit is contained in:
Hanlei Qin
2018-09-19 19:46:42 +08:00
committed by 云风
parent 46b49adf9e
commit f217a56f6e

View File

@@ -1,24 +1,23 @@
local skynet = require "skynet" local skynet = require "skynet"
local function dft_loader(path, name, G) local function dft_loader(path, name, G)
local errlist = {} local errlist = {}
for pat in string.gmatch(path,"[^;]+") do for pat in string.gmatch(path,"[^;]+") do
local filename = string.gsub(pat, "?", name) local filename = string.gsub(pat, "?", name)
local f , err = loadfile(filename, "bt", G) local f , err = loadfile(filename, "bt", G)
if f then if f then
return f, pat return f, pat
else else
table.insert(errlist, err) table.insert(errlist, err)
end end
end end
error(table.concat(errlist, "\n")) error(table.concat(errlist, "\n"))
end end
return function (name , G, loader) return function (name , G, loader)
loader = loader or dft_loader loader = loader or dft_loader
local mainfunc
local function func_id(id, group) local function func_id(id, group)
local tmp = {} local tmp = {}
@@ -42,7 +41,6 @@ return function (name , G, loader)
assert(getmetatable(G) == nil) assert(getmetatable(G) == nil)
assert(G.init == nil) assert(G.init == nil)
assert(G.exit == nil) assert(G.exit == nil)
assert(G.accept == nil) assert(G.accept == nil)
assert(G.response == nil) assert(G.response == nil)
end end
@@ -75,10 +73,8 @@ return function (name , G, loader)
end end
end end
local pattern local path = assert(skynet.getenv "snax" , "please set snax in config file")
local mainfunc, pattern = loader(path, name, G)
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 }) setmetatable(G, { __index = env , __newindex = init_system })
local ok, err = xpcall(mainfunc, debug.traceback) local ok, err = xpcall(mainfunc, debug.traceback)