From 6320d988ecc36775611d4a05fb621020329cfc25 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 21 Apr 2012 16:27:42 +0100
Subject: net.connlisteners: Be gone!

---
 net/connlisteners.lua | 81 ---------------------------------------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 net/connlisteners.lua

(limited to 'net/connlisteners.lua')

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
deleted file mode 100644
index 6a227c9d..00000000
--- a/net/connlisteners.lua
+++ /dev/null
@@ -1,81 +0,0 @@
--- Prosody IM
--- Copyright (C) 2008-2010 Matthew Wild
--- Copyright (C) 2008-2010 Waqas Hussain
--- 
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-
-
-local listeners_dir = (CFG_SOURCEDIR or ".").."/net/";
-local server = require "net.server";
-local log = require "util.logger".init("connlisteners");
-local tostring = tostring;
-local type = type
-local ipairs = ipairs
-
-local dofile, xpcall, error =
-      dofile, xpcall, error
-
-local debug_traceback = debug.traceback;
-
-module "connlisteners"
-
-local listeners = {};
-
-function register(name, listener)
-	if listeners[name] and listeners[name] ~= listener then
-		log("debug", "Listener %s is already registered, not registering any more", name);
-		return false;
-	end
-	listeners[name] = listener;
-	log("debug", "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
-		local ok, ret = xpcall(function() dofile(listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua") end, debug_traceback);
-		if not ok then
-			log("error", "Error while loading listener '%s': %s", tostring(name), tostring(ret));
-			return nil, ret;
-		end
-		h = listeners[name];
-	end
-	return h;
-end
-
-function start(name, udata)
-	local h, err = get(name);
-	if not h then
-		error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 0);
-	end
-	
-	local interfaces = (udata and udata.interface) or h.default_interface or "*";
-	if type(interfaces) == "string" then interfaces = {interfaces}; end
-	local port = (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);
-	local mode = (udata and udata.mode) or h.default_mode or 1;
-	local ssl = (udata and udata.ssl) or nil;
-	local autossl = udata and udata.type == "ssl";
-	
-	if autossl and not ssl then
-		return nil, "no ssl context";
-	end
-
-	ok, err = true, {};
-	for _, interface in ipairs(interfaces) do
-		local handler
-		handler, err[interface] = server.addserver(interface, port, h, mode, autossl and ssl or nil);
-		ok = ok and handler;
-	end
-
-	return ok, err;
-end
-
-return _M;
-- 
cgit v1.2.3


From a2055895d362fed58ff314820bb7fddd53e40436 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 28 Apr 2012 23:13:49 +0100
Subject: net.connlisteners: Add COMPAT stub, use portmanager!

---
 net/connlisteners.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 net/connlisteners.lua

(limited to 'net/connlisteners.lua')

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
new file mode 100644
index 00000000..99ddc720
--- /dev/null
+++ b/net/connlisteners.lua
@@ -0,0 +1,15 @@
+-- COMPAT w/pre-0.9
+local log = require "util.logger".init("net.connlisteners");
+local traceback = debug.traceback;
+
+module "httpserver"
+
+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
+
+register, deregister = fail, fail;
+get, start = fail, fail, epic_fail;
+
+return _M;
-- 
cgit v1.2.3