aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-06-21 22:50:23 +0200
committerKim Alvefur <zash@zash.se>2021-06-21 22:50:23 +0200
commite7df432614fc16a06f75c3e038176820f92a320d (patch)
treee213771171988fbc3e6b18267bf63b3c22d93bd5
parent8bde7461c18460e4fbbc87be6d0853d2a645d5ba (diff)
downloadprosody-e7df432614fc16a06f75c3e038176820f92a320d.tar.gz
prosody-e7df432614fc16a06f75c3e038176820f92a320d.zip
mod_bosh,mod_websocket: Make into global-shared modules (...again)
Global modules aren't quite considered loaded onto hosts, which causes confusion in some cases. They are also reported in the log as being served on http://*:5280/foo which is also a bit confusing, and can't be clicked. Global modules also have to have their paths configured in the global section, which could be confusing and unexpected. This global+shared method should be the best of both worlds.
-rw-r--r--plugins/mod_bosh.lua24
-rw-r--r--plugins/mod_websocket.lua26
2 files changed, 28 insertions, 22 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index c337c03c..7bf241cd 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -543,13 +543,17 @@ local function GET_response(event)
}) or "This is the Prosody BOSH endpoint.";
end
-module:depends("http");
-module:provides("http", {
- default_path = "/http-bind";
- route = {
- ["GET"] = GET_response;
- ["GET /"] = GET_response;
- ["POST"] = handle_POST;
- ["POST /"] = handle_POST;
- };
-});
+function module.add_host(module)
+ module:depends("http");
+ module:provides("http", {
+ default_path = "/http-bind";
+ route = {
+ ["GET"] = GET_response;
+ ["GET /"] = GET_response;
+ ["POST"] = handle_POST;
+ ["POST /"] = handle_POST;
+ };
+ });
+end
+
+module:add_host();
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index 80296c5b..04a8303a 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -348,18 +348,20 @@ local function keepalive(event)
end
end
-module:hook("c2s-read-timeout", keepalive, -0.9);
-
-module:depends("http");
-module:provides("http", {
- name = "websocket";
- default_path = "xmpp-websocket";
- route = {
- ["GET"] = handle_request;
- ["GET /"] = handle_request;
- };
-});
-
function module.add_host(module)
module:hook("c2s-read-timeout", keepalive, -0.9);
+
+ module:depends("http");
+ module:provides("http", {
+ name = "websocket";
+ default_path = "xmpp-websocket";
+ route = {
+ ["GET"] = handle_request;
+ ["GET /"] = handle_request;
+ };
+ });
+
+ module:hook("c2s-read-timeout", keepalive, -0.9);
end
+
+module:add_host();