Changeset

4916:31496e8227e8

mod_proxy65: Warn about pre-0.9 config style (per host proxy65_port)
author Kim Alvefur <zash@zash.se>
date Sun, 27 May 2012 01:17:59 +0200
parents 4915:3fbc01d1fc5a
children 4917:d1dca1d12d53
files plugins/mod_proxy65.lua
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_proxy65.lua	Sat May 26 19:49:43 2012 +0100
+++ b/plugins/mod_proxy65.lua	Sun May 27 01:17:59 2012 +0200
@@ -91,9 +91,15 @@
 	local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service");
 	
 	local proxy_address = module:get_option("proxy65_address", host);
-	local proxy_port = module:get_option_number("proxy65_port", next(portmanager.get_active_services():search("proxy65", nil)[1] or {}));
+	local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {});
 	local proxy_acl = module:get_option("proxy65_acl");
 
+	-- COMPAT w/pre-0.9 where proxy65_port was specified the components section of the config
+	local legacy_config = module:get_option_number("proxy65_port");
+	if legacy_config then
+		module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config);
+	end
+
 	module:add_identity("proxy", "bytestreams", name);
 	module:add_feature("http://jabber.org/protocol/bytestreams");