luna/aproxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add config file validation #2

Merged
luna merged 7 commits from config-validation into mistress 2022-12-07 18:50:30 +00:00
Conversation 0 Commits 7 Files changed 7 +13 -7
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 06b8173ecb - Show all commits

18
config.lua
View file

@ -109,17 +109,23 @@ local function writeSchemaErrors(errors, out)
out('sex')
end
local function loadConfigFile()
local function loadConfigFile(options)
local options = options or {}
local config_file_data = assert(findConfigFile(), 'no config file found, config path: ' .. config_path)
local config_file_function = assert(loadstring(config_file_data))
local config_object = config_file_function()
local schema_errors = validateConfigFile(config_object)
local total_count = table.pprint(schema_errors, {call=function() end})
if total_count > 0 then
log('CONFIG ERROR')
table.pprint(schema_errors, {call=log})
if options.validate then
local schema_errors = validateConfigFile(config_object)
local total_count = table.pprint(schema_errors, {call=function() end})
if total_count > 0 then
log('CONFIG ERROR')
table.pprint(schema_errors, {call=log})
end
end
return config_object
end

2
main.lua
View file

@ -15,7 +15,7 @@ ctx:loadFromConfig(config.loadConfigFile())
return {
init=function ()
-- validate config and print out errors
config.loadConfigFile()
config.loadConfigFile({validate = true})
end,
access=function()
ctx:onRequest()