diff src/luan/modules/logging/Logging.luan @ 1332:11b7e11f9ed5

cleaner logging
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 12 Feb 2019 21:50:26 -0700
parents 307e76ccd0d6
children 8d95711f6615
line wrap: on
line diff
--- a/src/luan/modules/logging/Logging.luan	Mon Feb 11 02:17:41 2019 -0700
+++ b/src/luan/modules/logging/Logging.luan	Tue Feb 12 21:50:26 2019 -0700
@@ -1,58 +1,22 @@
-local Luan = require "luan:Luan.luan"
-local error = Luan.error
 java()
-local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout"
-local ConsoleAppender = require "java:org.apache.log4j.ConsoleAppender"
-local Level = require "java:org.apache.log4j.Level"
 local LuanLogger = require "java:luan.modules.logging.LuanLogger"
 
+local Package = require "luan:Package.luan"
+if Package.load("java:org.apache.log4j.Logger") ~= false then
+	require "luan:logging/Log4j.luan"
+end
+
 
 local Logging = {}
 
-function Logging.init_root()
-	local root = LuanLogger.getRootLogger()
-	local has_appenders = root.getAllAppenders().hasMoreElements()
-	if not has_appenders then
-		root.setLevel(Level.INFO)
-		local layout = EnhancedPatternLayout.new("%d %-5p %c - %m%n")
-		local appender = ConsoleAppender.new(layout,"System.err");
-		root.addAppender(appender);
-	end
-end
-Logging.init_root()
-
-local function to_luan_logger(log4j_logger)
-	local tbl = {}
-
-	local luanLogger = LuanLogger.new(log4j_logger)
-	tbl.error = luanLogger.error
-	tbl.warn = luanLogger.warn
-	tbl.info = luanLogger.info
-	tbl.debug = luanLogger.debug
-
-	function tbl.get_level()
-		local level = log4j_logger.getLevel()
-		return level and level.toString()
-	end
-
-	function tbl.get_effective_level()
-		local level = log4j_logger.getEffectiveLevel()
-		return level and level.toString()
-	end
-
-	function tbl.set_level(level)
-		log4j_logger.setLevel( Level.toLevel(level) )
-	end
-
-	return tbl
-end
-
 function Logging.logger(name)
-	return to_luan_logger( LuanLogger.getLogger(name) )
-end
-
-function Logging.root_logger()
-	return to_luan_logger( LuanLogger.getRootLogger() )
+	local luan_logger = LuanLogger.new(name)
+	return {
+		error = luan_logger.error
+		warn = luan_logger.warn
+		info = luan_logger.info
+		debug = luan_logger.debug
+	}
 end
 
 return Logging