diff src/luan/modules/http/LuanHandler.java @ 1454:219f2b937f2b

remove log4j
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 08 Mar 2020 14:11:30 -0600
parents 56fb5cd8228d
children b89212fd04b5
line wrap: on
line diff
--- a/src/luan/modules/http/LuanHandler.java	Mon Mar 02 15:09:10 2020 -0700
+++ b/src/luan/modules/http/LuanHandler.java	Sun Mar 08 14:11:30 2020 -0600
@@ -35,13 +35,12 @@
 
 
 public final class LuanHandler implements Handler, Closeable {
-	private static final Logger sysLogger = LoggerFactory.getLogger(LuanHandler.class);
+	private static final Logger logger = LoggerFactory.getLogger(LuanHandler.class);
 
 	private static final Set<LuanHandler> dontGc = Collections.newSetFromMap(new ConcurrentHashMap<LuanHandler,Boolean>());
 
 	private final Luan luanInit;
 	private final String domain;
-	private final Logger luanLogger;
 	private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
 	private volatile Luan currentLuan;
 	private volatile boolean isDisabled = false;
@@ -64,7 +63,6 @@
 	public LuanHandler(Luan luanInit,String domain) {
 		this.luanInit = luanInit;
 		this.domain = domain;
-		this.luanLogger = luanInit.getLogger(LuanHandler.class);
 		try {
 			Fns fns = new Fns(this);
 			LuanTable Http = (LuanTable)luanInit.require("luan:http/Http.luan");
@@ -77,13 +75,13 @@
 			throw new RuntimeException(e);
 		}
 		if( domain != null )
-			sysLogger.info("new "+domain);
+			logger.info("new "+domain);
 		currentLuan = newLuan();
 	}
 
 	protected void finalize() throws Throwable {
 		if( domain != null )
-			sysLogger.info("gc "+domain);
+			logger.info("gc "+domain);
 	}
 
 	private Luan newLuan() {
@@ -92,21 +90,19 @@
 			LuanCloner cloner = new LuanCloner(LuanCloner.Type.COMPLETE);
 			luan = (Luan)cloner.clone(luanInit);
 		}
+		LuanLogger.startThreadLogging(luan);
 		try {
 			PackageLuan.load(luan,"site:/init.luan");
 		} catch(LuanException e) {
 			//e.printStackTrace();
 			String err = e.getLuanStackTraceString();
-			luanLogger.error(err);
+			logger.error(err);
+		} finally {
+			LuanLogger.endThreadLogging();
 		}
 		return luan;
 	}
 
-/*
-	public Luan getLuan() {
-		return luan;
-	}
-*/
 	static final String NOT_FOUND = "luan-not-found";
 
 	@Override public Response handle(Request request) {
@@ -122,14 +118,16 @@
 		String oldName = thread.getName();
 		thread.setName(request.headers.get("host")+request.path);
 		rwLock.readLock().lock();
+		LuanLogger.startThreadLogging(currentLuan);
 		try {
 			return service(request,notFound);
 		} catch(LuanException e) {
 			String err = e.getLuanStackTraceString();
-			luanLogger.error(err+"\n"+request.rawHead.trim()+"\n");
+			logger.error(err+"\n"+request.rawHead.trim()+"\n");
 			String msg = "Internel Server Error\n\n" + err;
 			return Response.errorResponse( Status.INTERNAL_SERVER_ERROR, msg );
 		} finally {
+			LuanLogger.endThreadLogging();
 			rwLock.readLock().unlock();
 			thread.setName(oldName);
 		}
@@ -137,11 +135,12 @@
 
 	public void close() {
 		Object obj = dontGc.remove(this);
-		//sysLogger.info("close "+domain+" "+(obj!=null));
+		//logger.info("close "+domain+" "+(obj!=null));
 	}
 
 	public Object call_rpc(String fnName,Object... args) throws LuanException {
 		rwLock.readLock().lock();
+		LuanLogger.startThreadLogging(currentLuan);
 		try {
 			LuanFunction fn;
 			synchronized(luanInit) {
@@ -156,6 +155,7 @@
 			}
 			return fn.call(args);
 		} finally {
+			LuanLogger.endThreadLogging();
 			rwLock.readLock().unlock();
 		}
 	}
@@ -196,7 +196,7 @@
 
 	private void dont_gc() {
 		dontGc.add(this);
-		//sysLogger.info("dont_gc "+domain);
+		//logger.info("dont_gc "+domain);
 	}
 
 	public static final class Fns {