diff src/luan/modules/logging/Logging.luan @ 1321:307e76ccd0d6

generalize separate logging
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 05 Feb 2019 22:36:55 -0700
parents 3995cbe5b00a
children 11b7e11f9ed5
line wrap: on
line diff
--- a/src/luan/modules/logging/Logging.luan	Mon Feb 04 20:18:51 2019 -0700
+++ b/src/luan/modules/logging/Logging.luan	Tue Feb 05 22:36:55 2019 -0700
@@ -1,7 +1,6 @@
 local Luan = require "luan:Luan.luan"
 local error = Luan.error
 java()
-local Logger = require "java:org.apache.log4j.Logger"
 local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout"
 local ConsoleAppender = require "java:org.apache.log4j.ConsoleAppender"
 local Level = require "java:org.apache.log4j.Level"
@@ -10,18 +9,17 @@
 
 local Logging = {}
 
-function Logging.init()
-	local root = Logger.getRootLogger()
+function Logging.init_root()
+	local root = LuanLogger.getRootLogger()
 	local has_appenders = root.getAllAppenders().hasMoreElements()
-	if has_appenders then
-		return false
+	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
-	root.setLevel(Level.INFO)
-	local layout = EnhancedPatternLayout.new("%d %-5p %c - %m%n")
-	local appender = ConsoleAppender.new(layout,"System.err");
-	root.addAppender(appender);
-	return true
 end
+Logging.init_root()
 
 local function to_luan_logger(log4j_logger)
 	local tbl = {}
@@ -50,11 +48,11 @@
 end
 
 function Logging.logger(name)
-	return to_luan_logger( Logger.getLogger(name) )
+	return to_luan_logger( LuanLogger.getLogger(name) )
 end
 
 function Logging.root_logger()
-	return to_luan_logger( Logger.getRootLogger() )
+	return to_luan_logger( LuanLogger.getRootLogger() )
 end
 
 return Logging