Mercurial Hosting > luan
diff src/luan/modules/http/LuanHandler.java @ 1321:307e76ccd0d6
generalize separate logging
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Tue, 05 Feb 2019 22:36:55 -0700 |
parents | f7355714742f |
children | 11b7e11f9ed5 |
line wrap: on
line diff
--- a/src/luan/modules/http/LuanHandler.java Mon Feb 04 20:18:51 2019 -0700 +++ b/src/luan/modules/http/LuanHandler.java Tue Feb 05 22:36:55 2019 -0700 @@ -12,8 +12,7 @@ import java.util.ArrayList; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.log4j.Logger; import luan.webserver.Request; import luan.webserver.Response; import luan.webserver.Status; @@ -29,6 +28,7 @@ import luan.LuanException; import luan.modules.PackageLuan; import luan.modules.BasicLuan; +import luan.modules.logging.LuanLogger; public final class LuanHandler implements Handler, LuanState.OnClose { @@ -52,11 +52,9 @@ } } - public LuanHandler(LuanState luanInit,String loggerRoot) { + public LuanHandler(LuanState luanInit) { this.luanInit = luanInit; - if( loggerRoot==null ) - loggerRoot = ""; - logger = LoggerFactory.getLogger(loggerRoot+LuanHandler.class.getName()); + this.logger = LuanLogger.getLogger(luanInit,LuanHandler.class.getName()); try { LuanTable Http = (LuanTable)luanInit.require("luan:http/Http.luan"); Http.put( "reset_luan", new LuanJavaFunction(resetLuanMethod,this) ); @@ -75,6 +73,7 @@ try { PackageLuan.load(luan,"site:/init.luan"); } catch(LuanException e) { + //e.printStackTrace(); String err = e.getLuanStackTraceString(); logger.error(err); }