diff src/luan/host/Init.luan @ 1321:307e76ccd0d6

generalize separate logging
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 05 Feb 2019 22:36:55 -0700
parents 5763597ca5c0
children
line wrap: on
line diff
--- a/src/luan/host/Init.luan	Mon Feb 04 20:18:51 2019 -0700
+++ b/src/luan/host/Init.luan	Tue Feb 05 22:36:55 2019 -0700
@@ -7,24 +7,21 @@
 
 local Init = {}
 
-local dir, domain = ...
+local dir, domain, logging = ...
 
 
 -- logging
 
-java()
-local Logger = require "java:org.apache.log4j.Logger"
-local Level = require "java:org.apache.log4j.Level"
-local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout"
-local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender"
-
-local root = gsub(domain,"\.",":")
-
-local logger = Logger.getLogger(root)
-local has_appenders = logger.getAllAppenders().hasMoreElements()
-if not has_appenders then
-	logger.setAdditivity(false)
-	local layout = EnhancedPatternLayout.new("%d %-5p %c{-1} - %m%n")
+if logging then
+	java()
+	local LuanLogger = require "java:luan.modules.logging.LuanLogger"
+	local Level = require "java:org.apache.log4j.Level"
+	local EnhancedPatternLayout = require "java:org.apache.log4j.EnhancedPatternLayout"
+	local RollingFileAppender = require "java:org.apache.log4j.RollingFileAppender"
+	
+	local logger = LuanLogger.getRootLogger()
+	logger.removeAllAppenders()
+	local layout = EnhancedPatternLayout.new("%d %-5p %c - %m%n")
 	local log_dir = dir.."/site/private/local/logs/"
 
 	local function add_appender(file,level)
@@ -41,20 +38,6 @@
 	add_appender("info.log",Level.INFO)
 end
 
-local Logging = require "luan:logging/Logging.luan"
-
-local old_logger = Logging.logger
-Logging.luanhost_logger = old_logger
-
-function Logging.root_logger()
-	return old_logger(root)
-end
-
-function Logging.logger(name)
-	return old_logger( root .. "." .. name )
-end
-
-Init.logger_root = root.."."
 
 
 -- set vars