diff src/luan/host/WebHandler.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/host/WebHandler.java	Tue Feb 12 21:50:26 2019 -0700
+++ b/src/luan/host/WebHandler.java	Tue Feb 12 22:33:40 2019 -0700
@@ -8,7 +8,6 @@
 import luan.webserver.Response;
 import luan.webserver.handlers.DomainHandler;
 import luan.Luan;
-import luan.LuanState;
 import luan.LuanException;
 import luan.LuanTable;
 import luan.LuanFunction;
@@ -39,7 +38,7 @@
 			String logDir = dirStr + "/site/private/local/logs/web";
 			new File(logDir).mkdirs();
 
-			LuanState luan = new LuanState();
+			Luan luan = new Luan();
 			try {
 				Log4j.newLoggerRepository(luan);
 			} catch(LuanException e) {
@@ -100,7 +99,7 @@
 		return true;
 	}
 */
-	static void initLuan(LuanState luan,String dir,String domain,boolean logging) {
+	static void initLuan(Luan luan,String dir,String domain,boolean logging) {
 		security(luan,dir);
 		try {
 			LuanFunction fn = BasicLuan.load_file(luan,"classpath:luan/host/init.luan");
@@ -122,10 +121,10 @@
 		}
 	}
 
-	private static final void security(LuanState luan,String dir) {
+	private static final void security(Luan luan,String dir) {
 		final String siteUri = "file:" + dir + "/site";
 		Luan.Security security = new Luan.Security() {
-			public void check(LuanState luan,LuanClosure closure,String op,Object... args)
+			public void check(Luan luan,LuanClosure closure,String op,Object... args)
 				throws LuanException
 			{
 				if( op.equals("uri") ) {