aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-13 16:22:05 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-13 16:22:05 +0000
commitdfab1660798f6bc7458ea2ecc62b18415a1c7608 (patch)
tree5dddfd9846e956e07356266fe6ec2d522be8e2d0
parentc311d42f9b1cef2ef255045585ffc348164783d8 (diff)
downloadprosody-dfab1660798f6bc7458ea2ecc62b18415a1c7608.tar.gz
prosody-dfab1660798f6bc7458ea2ecc62b18415a1c7608.zip
prosody: More accurate friendly error message in the event that creating the global SSL context fails
-rwxr-xr-xprosody8
1 files changed, 6 insertions, 2 deletions
diff --git a/prosody b/prosody
index 2f60181e..49580bd9 100755
--- a/prosody
+++ b/prosody
@@ -232,8 +232,12 @@ function init_global_state()
elseif err:match("permission") then
friendly_message = "Prosody does not have sufficient privileges to use this port";
elseif err == "no ssl context" then
- friendly_message = "there is no 'ssl' config under Host \"*\" which is "
- .."require for legacy SSL ports";
+ if not config.get("*", "core", "ssl") then
+ friendly_message = "there is no 'ssl' config under Host \"*\" which is "
+ .."require for legacy SSL ports";
+ else
+ friendly_message = "initializing SSL support failed, see previous log entries";
+ end
end
log("error", "Failed to open server port %d, %s", port, friendly_message);
end