X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fconnlisteners.lua;h=000bfa63effa2d85598ca02eb72652240bbc4928;hb=59224f73ca26a00292f127e081af3cf47f57ae1f;hp=2b95331c2a6a2d68f9c4f7e6891acb14dc458df6;hpb=2c2ade0732a15265ecc2842d2a378d1a16baba37;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 2b95331c..000bfa63 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,45 +1,18 @@
+-- COMPAT w/pre-0.9
+local log = require "util.logger".init("net.connlisteners");
+local traceback = debug.traceback;
 
-local server_add = require "net.server".add;
-local log = require "util.logger".init("connlisteners");
+local _ENV = nil;
 
-local dofile, pcall, error = 
-	dofile, pcall, error
-
-module "connlisteners"
-
-local listeners = {};
-
-function register(name, listener)
-	if listeners[name] and listeners[name] ~= listener then
-		log("warning", "Listener %s is already registered, not registering any more", name);
-		return false;
-	end
-	listeners[name] = listener;
-	log("info", "Registered connection listener %s", name);
-	return true;
-end
-
-function deregister(name)
-	listeners[name] = nil;
-end
-
-function get(name)
-	local h = listeners[name];
-	if not h then
-		pcall(dofile, "net/"..name:gsub("[^%w%-]", "_").."_listener.lua");
-		h = listeners[name];
-	end
-	return h;
-end
-
-function start(name, udata)
-	local h = get(name);
-	if not h then
-		error("No such connection module: "..name, 0);
-	end
-	return server_add(h, 
-			(udata and udata.port) or h.default_port or error("Can't start listener "..name.." because no port was specified, and it has no default port", 0), 
-				(udata and udata.interface) or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil );
+local function fail()
+	log("error", "Attempt to use legacy connlisteners API. For more info see http://prosody.im/doc/developers/network");
+	log("error", "Legacy connlisteners API usage, %s", traceback("", 2));
 end
 
-return _M;
\ No newline at end of file
+return {
+	register = fail;
+	register = fail;
+	get = fail;
+	start = fail;
+	-- epic fail
+};