X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=net%2Fconnlisteners.lua;h=99ddc720aa570fb02765191ca6b1c47eaddaaee0;hb=f50f4cb01c079cfa913a76313859e469abbda12e;hp=a5c8755f28790ae40a6b25974753fe4c82dddc90;hpb=dda60a00dfba3152f2cd7241c14911f58c598ac4;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index a5c8755f..99ddc720 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,40 +1,15 @@
+-- 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");
+module "httpserver"
 
-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;
+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
 
-function deregister(name)
-	listeners[name] = nil;
-end
-
-function start(name, udata)
-	local h = listeners[name]
-	if not h then
-		pcall(dofile, "net/"..name:gsub("[^%w%-]", "_").."_listener.lua");
-		h = listeners[name];
-		if not h then
-			error("No such connection module: "..name, 0);
-		end
-	end
-	return server_add(h, 
-			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.interface or "*", udata.mode or h.default_mode or 1, udata.ssl );
-end
+register, deregister = fail, fail;
+get, start = fail, fail, epic_fail;
 
-return _M;
\ No newline at end of file
+return _M;