prosody
8154bc28e520
plugins/mod_bosh.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/mod_bosh.lua @ 4332:8154bc28e520

mod_bosh: Update to use typed variants of module:get_option(), makes it more tolerant to config variations and simplifies the code.
author Matthew Wild <mwild1@gmail.com>
date Wed, 20 Jul 2011 17:22:21 -0400
parent 4327:98ae0d0b4d07
child 4379:e4d88f4a780c
line wrap: on
line diff
--- a/plugins/mod_bosh.lua	Tue Jul 19 12:51:59 2011 -0400
+++ b/plugins/mod_bosh.lua	Wed Jul 20 17:22:21 2011 -0400
@@ -29,16 +29,16 @@
 local stream_callbacks = {
 	stream_ns = xmlns_bosh, stream_tag = "body", default_ns = "jabber:client" };
 
-local BOSH_DEFAULT_HOLD = tonumber(module:get_option("bosh_default_hold")) or 1;
-local BOSH_DEFAULT_INACTIVITY = tonumber(module:get_option("bosh_max_inactivity")) or 60;
-local BOSH_DEFAULT_POLLING = tonumber(module:get_option("bosh_max_polling")) or 5;
-local BOSH_DEFAULT_REQUESTS = tonumber(module:get_option("bosh_max_requests")) or 2;
+local BOSH_DEFAULT_HOLD = module:get_option_number("bosh_default_hold", 1);
+local BOSH_DEFAULT_INACTIVITY = module:get_option_number("bosh_max_inactivity", 60);
+local BOSH_DEFAULT_POLLING = module:get_option_number("bosh_max_polling", 5);
+local BOSH_DEFAULT_REQUESTS = module:get_option_number("bosh_max_requests", 2);
 
 local consider_bosh_secure = module:get_option_boolean("consider_bosh_secure");
 
 local default_headers = { ["Content-Type"] = "text/xml; charset=utf-8" };
 
-local cross_domain = module:get_option("cross_domain_bosh");
+local cross_domain = module:get_option("cross_domain_bosh", false);
 if cross_domain then
 	default_headers["Access-Control-Allow-Methods"] = "GET, POST, OPTIONS";
 	default_headers["Access-Control-Allow-Headers"] = "Content-Type";
@@ -426,7 +426,7 @@
 
 
 local function setup()
-	local ports = module:get_option("bosh_ports") or { 5280 };
+	local ports = module:get_option_array("bosh_ports") or { 5280 };
 	httpserver.new_from_config(ports, handle_request, { base = "http-bind" });
 	timer.add_task(1, on_timer);
 end