diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
| commit | f52319aeb3d82d34fdf8699084cdff3460d43c5c (patch) | |
| tree | 5c9f629f0035697faa311531db3b3d0267e4f1e3 /plugins/mod_http.lua | |
| parent | 829b01aba17e13d75c13679fe6343171378e25d9 (diff) | |
| parent | 5cc3f03d5aab0516358addd949281c2e3fa70688 (diff) | |
| download | prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.tar.gz prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_http.lua')
| -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) |