Mercurial Hosting > luan
diff src/luan/modules/logging/Logging.luan @ 1088:bae2d0c2576c
change module naming convention
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Mon, 26 Dec 2016 22:29:36 -0700 |
parents | 1a68fc55a80c |
children | 14ffce5bb894 |
line wrap: on
line diff
--- a/src/luan/modules/logging/Logging.luan Mon Dec 19 01:38:21 2016 -0700 +++ b/src/luan/modules/logging/Logging.luan Mon Dec 26 22:29:36 2016 -0700 @@ -6,49 +6,49 @@ local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender" local LuanLogger = require "java:luan.modules.logging.LuanLogger" -local M = {} +local Logging = {} -M.layout = "%d %-5p %c - %m%n" +Logging.layout = "%d %-5p %c - %m%n" -M.level = "INFO" +Logging.level = "INFO" -M.console = "System.err" -- or "System.out" or set to nil for no console +Logging.console = "System.err" -- or "System.out" or set to nil for no console -M.file = nil -- set to file name if you want logging to a file +Logging.file = nil -- set to file name if you want logging to a file -M.max_file_size = nil -- by default is "10MB" +Logging.max_file_size = nil -- by default is "10MB" -M.log4j_root_logger = Logger.getRootLogger() +Logging.log4j_root_logger = Logger.getRootLogger() local function to_level(level) return level and Level.toLevel(level) end -function M.log_to_file(file,logger_name) -- logger_name is optional, defaults to root logger - local appender = RollingFileAppender.new(M.ptn_layout, file) - appender.setMaxFileSize(M.max_file_size) - local logger = logger_name and Logger.getLogger(logger_name) or M.log4j_root_logger +function Logging.log_to_file(file,logger_name) -- logger_name is optional, defaults to root logger + local appender = RollingFileAppender.new(Logging.ptn_layout, file) + appender.setMaxFileSize(Logging.max_file_size) + local logger = logger_name and Logger.getLogger(logger_name) or Logging.log4j_root_logger logger.addAppender(appender) return appender end -function M.init() - M.log4j_root_logger.removeAllAppenders() - M.log4j_root_logger.setLevel( to_level(M.level) ) - M.ptn_layout = EnhancedPatternLayout.new(M.layout) +function Logging.init() + Logging.log4j_root_logger.removeAllAppenders() + Logging.log4j_root_logger.setLevel( to_level(Logging.level) ) + Logging.ptn_layout = EnhancedPatternLayout.new(Logging.layout) - if M.console ~= nil then - M.console_appender = ConsoleAppender.new(M.ptn_layout,M.console) - M.log4j_root_logger.addAppender(M.console_appender) + if Logging.console ~= nil then + Logging.console_appender = ConsoleAppender.new(Logging.ptn_layout,Logging.console) + Logging.log4j_root_logger.addAppender(Logging.console_appender) else - M.console_appender = nil + Logging.console_appender = nil end - if M.file ~= nil then - M.file_appender = M.log_to_file(M.file) + if Logging.file ~= nil then + Logging.file_appender = Logging.log_to_file(Logging.file) else - M.file_appender = nil + Logging.file_appender = nil end end @@ -79,12 +79,12 @@ return tbl end -function M.logger(name) +function Logging.logger(name) return to_luan_logger( Logger.getLogger(name) ) end -function M.root_logger() +function Logging.root_logger() return to_luan_logger( Logger.getRootLogger() ) end -return M +return Logging