Mercurial Hosting > luan
diff src/luan/modules/http/Server.luan @ 1281:7fc83fd2a39a
http/Server cleanup
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Thu, 20 Dec 2018 14:09:19 -0700 |
parents | 3f4644246e39 |
children | 51a1987b55a3 |
line wrap: on
line diff
--- a/src/luan/modules/http/Server.luan Thu Dec 20 13:38:16 2018 -0700 +++ b/src/luan/modules/http/Server.luan Thu Dec 20 14:09:19 2018 -0700 @@ -40,10 +40,10 @@ end end -function Server.start() +local function start(server) try { function() - LuanHandler.start(Server.server) + LuanHandler.start(server) end catch = function(e) -- e.java.printStackTrace(); @@ -53,9 +53,9 @@ } end -function Server.start_rpc() +function Server.start_rpc(luan_handler) function Rpc.functions.call(domain,fn_name,...) - return Server.luan_handler.call_rpc(fn_name,...) + return luan_handler.call_rpc(fn_name,...) end Thread.fork(Rpc.serve) end @@ -74,20 +74,21 @@ handler = ContentTypeHandler.new(handler) handler = SafeHandler.new(handler) handler = LogHandler.new(handler) - Server.server = JavaServer.new(port,handler) - Server.start() - Server.start_rpc() + local server = JavaServer.new(port,handler) + start(server) + return server, luan_handler end function Server.serve_for_proxy(dir,port) port = port or 8080 Server.init_dir(dir) - local handler = LuanHandler.new() - handler = IndexHandler.new(handler) + local luan_handler = LuanHandler.new() + local handler = IndexHandler.new(luan_handler) handler = ContentTypeHandler.new(handler) handler = SafeHandler.new(handler) - Server.server = JavaServer.new(port,handler) - Server.start() + local server = JavaServer.new(port,handler) + start(server) + return server, luan_handler end return Server