only run config validations on init callback
This commit is contained in:
parent
4d92a58349
commit
06b8173ecb
2 changed files with 13 additions and 7 deletions
18
config.lua
18
config.lua
|
@ -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
2
main.lua
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue