Mercurial Hosting > luan
diff src/luan/host/WebHandler.java @ 1321:307e76ccd0d6
generalize separate logging
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Tue, 05 Feb 2019 22:36:55 -0700 |
parents | 5763597ca5c0 |
children | f41919741100 |
line wrap: on
line diff
--- a/src/luan/host/WebHandler.java Mon Feb 04 20:18:51 2019 -0700 +++ b/src/luan/host/WebHandler.java Tue Feb 05 22:36:55 2019 -0700 @@ -13,6 +13,7 @@ import luan.modules.IoLuan; import luan.modules.JavaLuan; import luan.modules.http.LuanHandler; +import luan.modules.logging.LuanLogger; public class WebHandler implements Handler { @@ -29,9 +30,13 @@ new File(logDir).mkdirs(); LuanState luan = new LuanState(); - LuanTable init = initLuan(luan,dirStr,domain); - String loggerRoot = (String)init.rawGet("logger_root"); - return new LuanHandler(luan,loggerRoot); + try { + LuanLogger.newLoggerRepository(luan); + } catch(LuanException e) { + throw new RuntimeException(e); + } + initLuan(luan,dirStr,domain,true); + return new LuanHandler(luan); } }; @@ -85,13 +90,13 @@ return true; } */ - static LuanTable initLuan(LuanState luan,String dir,String domain) { + static LuanTable initLuan(LuanState luan,String dir,String domain,boolean logging) { LuanTable init; try { init = (LuanTable)luan.eval( "local Luan = require 'luan:Luan.luan'\n" +"local f = Luan.load_file 'classpath:luan/host/Init.luan'\n" - +"return f('"+dir+"','"+domain+"')\n" + +"return f('"+dir+"','"+domain+"',"+logging+")\n" ); } catch(LuanException e) { throw new RuntimeException(e);