aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/server.lua16
-rw-r--r--net/server_select.lua3
2 files changed, 3 insertions, 16 deletions
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,
diff --git a/net/server_select.lua b/net/server_select.lua
index d6cfc1f8..70825ada 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -75,7 +75,6 @@ local id
local loop
local stats
local idfalse
-local addtimer
local closeall
local addsocket
local addserver
@@ -921,6 +920,7 @@ end
----------------------------------// PUBLIC INTERFACE //--
return {
+ _addtimer = addtimer,
addclient = addclient,
wrapclient = wrapclient,
@@ -930,7 +930,6 @@ return {
step = step,
stats = stats,
closeall = closeall,
- addtimer = addtimer,
addserver = addserver,
getserver = getserver,
setlogger = setlogger,