diff --git a/container.lua b/container.lua index c4d7f625..5a4e93f2 100644 --- a/container.lua +++ b/container.lua @@ -28,22 +28,22 @@ local Container = { } function Container.log(level,...) - if level >= Container.logLevel then Container.stdout(...) end + if level <= Container.logLevel then Container.stdout(...) end end function Container.stdout(...) local msg = '' for _,value in pairs({...}) do msg = msg..' '..Container.tostring(value) end - if Container.handlers.log then - Container.handlers.log(msg) + if Container.handlers.logging then + Container.handlers.logging(msg) else log(msg) end end function Container.error(...) - if Container.safeError then Container.stdout(...) else Container.stderr(...) end + if Container.safeError then Container.stdout('ERROR',...) else Container.stderr(...) end end function Container.stderr(type,...) local msg = 'ERROR: '..type @@ -110,7 +110,7 @@ function Container.loadFile(filePath) local success,file = pcall(require,filePath) if not success then return Container.error(Container.defines.errorLoad,file) end if not file then return Container.error(Container.defines.errorNotFound) end - Container.log(Container.defines.logDebug,'Loaded file: ',filePath) + Container.log(Container.defines.logDebug,'Loaded file:',filePath) return file end diff --git a/control.lua b/control.lua index 47616f1b..7a53e789 100644 --- a/control.lua +++ b/control.lua @@ -1,4 +1,4 @@ --- not_luadoc=true +--[[ not_luadoc=true function _log(...) log(...) end -- do not remove this is used for smaller verbose lines Manager = require("FactorioSoftmodManager") Manager.setVerbose{ @@ -12,14 +12,14 @@ Manager.setVerbose{ output=Manager._verbose -- can be: can be: print || log || other function } Manager() -- can be Manager.loadModules() if called else where +]] ---[[ -Container = require 'container' +local Container = require 'container' Container.handlers = { --event --global error=error, - log=function(...) _R.log(...) end, + logging=function(...) log(...) end, --debug tableToString=serpent.line } @@ -28,4 +28,3 @@ Container.files = { 'modules.test' } Container.loadFiles() -]] \ No newline at end of file