diff src/luan/modules/logging/Log4j.java @ 1333:25746915a241

merge Luan and LuanState
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 12 Feb 2019 22:33:40 -0700
parents 11b7e11f9ed5
children e0cf0d108a77
line wrap: on
line diff
--- a/src/luan/modules/logging/Log4j.java	Tue Feb 12 21:50:26 2019 -0700
+++ b/src/luan/modules/logging/Log4j.java	Tue Feb 12 22:33:40 2019 -0700
@@ -7,7 +7,7 @@
 import org.apache.log4j.spi.LoggerRepository;
 import org.apache.log4j.spi.RootLogger;
 import org.apache.log4j.spi.RepositorySelector;
-import luan.LuanState;
+import luan.Luan;
 import luan.LuanException;
 import luan.LuanTable;
 
@@ -15,7 +15,7 @@
 public final class Log4j {
 	private static String KEY = "Logger.Repository";
 
-	public static void newLoggerRepository(LuanState luan) throws LuanException {
+	public static void newLoggerRepository(Luan luan) throws LuanException {
 		LoggerRepository lr =  new Hierarchy(new RootLogger(Level.DEBUG));
 		luan.registry().put(KEY,lr);
 		LuanTable module = (LuanTable)luan.require("luan:logging/Log4j.luan");
@@ -24,7 +24,7 @@
 
 	private static final LoggerRepository defaultLoggerRepository = LogManager.getLoggerRepository();
 
-	private static LoggerRepository getLoggerRepository(LuanState luan) {
+	private static LoggerRepository getLoggerRepository(Luan luan) {
 		LoggerRepository lr = (LoggerRepository)luan.registry().get(KEY);
 		return lr != null ? lr : defaultLoggerRepository;
 	}
@@ -32,17 +32,17 @@
 	static {
 		LogManager.setRepositorySelector( new RepositorySelector() {
 			public LoggerRepository getLoggerRepository() {
-				LuanState luan = LuanLogger.luan();
+				Luan luan = LuanLogger.luan();
 				return luan==null ? defaultLoggerRepository : Log4j.getLoggerRepository(luan);
 			}
 		}, new Object() );
 	}
 
-	public static Logger getRootLogger(LuanState luan) {
+	public static Logger getRootLogger(Luan luan) {
 		return getLoggerRepository(luan).getRootLogger();
 	}
 
-	public static Logger getLogger(LuanState luan,String name) {
+	public static Logger getLogger(Luan luan,String name) {
 		return getLoggerRepository(luan).getLogger(name);
 	}
 }