diff logging/src/luan/modules/logging/Logging.luan @ 503:92c3d22745b8

make _ENV optional
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 20 May 2015 23:24:46 -0600
parents 0a75ed73bccc
children 9bf9ad733827
line wrap: on
line diff
--- a/logging/src/luan/modules/logging/Logging.luan	Tue May 19 17:57:20 2015 -0600
+++ b/logging/src/luan/modules/logging/Logging.luan	Wed May 20 23:24:46 2015 -0600
@@ -6,52 +6,53 @@
 local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender"
 local LuanLogger = require "java:luan.modules.logging.LuanLogger"
 
+local M = {}
 
-layout = "%d %-5p %c - %m%n"
+M.layout = "%d %-5p %c - %m%n"
 
-level = "INFO"
+M.level = "INFO"
 
-console = "System.err"  -- or "System.out" or set to nil for no console
+M.console = "System.err"  -- or "System.out" or set to nil for no console
 
-file = nil  -- set to file name if you want logging to a file
+M.file = nil  -- set to file name if you want logging to a file
 
-max_file_size = nil  -- by default is "10MB"
+M.max_file_size = nil  -- by default is "10MB"
 
 
-log4j_root_logger = Logger.getRootLogger()
+M.log4j_root_logger = Logger.getRootLogger()
 
 local function to_level(level)
 	return level and Level.toLevel(level)
 end
 
-function log_to_file(file,logger_name)  -- logger_name is optional, defaults to root logger
-	local appender = RollingFileAppender.new(ptn_layout, file)
-	appender.setMaxFileSize(max_file_size)
-	local logger = logger_name and Logger.getLogger(logger_name) or log4j_root_logger
+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
 	logger.addAppender(appender)
 	return appender
 end
 
-function init()
-	log4j_root_logger.removeAllAppenders()
-	log4j_root_logger.setLevel( to_level(level) )
-	ptn_layout = EnhancedPatternLayout.new(layout)
+function M.init()
+	M.log4j_root_logger.removeAllAppenders()
+	M.log4j_root_logger.setLevel( to_level(M.level) )
+	M.ptn_layout = EnhancedPatternLayout.new(M.layout)
 
-	if console ~= nil then
-		console_appender = ConsoleAppender.new(ptn_layout,console)
-		log4j_root_logger.addAppender(console_appender)
+	if M.console ~= nil then
+		M.console_appender = ConsoleAppender.new(M.ptn_layout,M.console)
+		M.log4j_root_logger.addAppender(M.console_appender)
 	else
-		console_appender = nil
+		M.console_appender = nil
 	end
 
-	if file ~= nil then
-		file_appender = log_to_file(file)
+	if M.file ~= nil then
+		M.file_appender = M.log_to_file(M.file)
 	else
-		file_appender = nil
+		M.file_appender = nil
 	end
 end
 
-init()
+M.init()
 
 
 local function to_luan_logger(log4j_logger)
@@ -80,10 +81,12 @@
 	return tbl
 end
 
-function logger(name)
+function M.logger(name)
 	return to_luan_logger( Logger.getLogger(name) )
 end
 
-function root_logger()
+function M.root_logger()
 	return to_luan_logger( Logger.getRootLogger() )
 end
+
+return M