diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:11:58 +0000 |
| commit | 29f906c30d10ce983b6c034d88bf7a3c8b576bb0 (patch) | |
| tree | 05c689e53d3416f52f0e9c782cf05887e5fe14da /plugins | |
| parent | 13edf3e093fd656d5110b277eca4c9805f3d925c (diff) | |
| parent | 51bef3673c57c5a2e323a7eb1424c85498905f53 (diff) | |
| download | prosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.tar.gz prosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.zip | |
Merge 0.9->0.10 (third time lucky)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_http.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 8bda1cac..086887fb 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -74,6 +74,8 @@ function moduleapi.http_url(module, app_name, default_path) return url_build(url); end end + module:log("warn", "No http ports enabled, can't generate an external URL"); + return "http://disabled.invalid/"; end function module.add_host(module) @@ -118,6 +120,12 @@ function module.add_host(module) module:log("error", "Invalid route in %s, %q. See http://prosody.im/doc/developers/http#routes", app_name, key); end end + local services = portmanager.get_active_services(); + if services:get("https") or services:get("http") then + module:log("debug", "Serving '%s' at %s", app_name, module:http_url(app_name, app_path)); + else + module:log("warn", "Not listening on any ports, '%s' will be unreachable", app_name); + end end local function http_app_removed(event) |