From ffa939698b14e8518c2b15417ae58d1eae26f2ed Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 3 May 2012 16:48:34 +0100 Subject: net.server, net.timer, net.server_select: Rearrange dependencies between these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani) --- net/server.lua | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'net/server.lua') diff --git a/net/server.lua b/net/server.lua index 1c1a63a4..d644af56 100644 --- a/net/server.lua +++ b/net/server.lua @@ -18,19 +18,8 @@ end local server; if use_luaevent then - server = require "net.server_event"; - -- util.timer requires "net.server", so instead of having - -- Lua look for, and load us again (causing a loop) - set this here - -- (usually it isn't set until we return, look down there...) - package.loaded["net.server"] = server; - - -- Backwards compatibility for timers, addtimer - -- called a function roughly every second - local add_task = require "util.timer".add_task; - function server.addtimer(f) - return add_task(1, function (...) f(...); return 1; end); - end - + server = require "net.server_select"; + -- Overwrite signal.signal() because we need to ask libevent to -- handle them instead local ok, signal = pcall(require, "util.signal"); @@ -48,7 +37,6 @@ if use_luaevent then end else server = require "net.server_select"; - package.loaded["net.server"] = server; end -- require "net.server" shall now forever return this, -- cgit v1.2.3