aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
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
commit27114996e41d03b74913ccf02240ae572e09ad82 (patch)
tree47496cb66d056e999a4d55f5f1833090e789ffd9 /prosody
parent4a592b5069548aa13a6aad96a1fcb54222345290 (diff)
downloadprosody-27114996e41d03b74913ccf02240ae572e09ad82.tar.gz
prosody-27114996e41d03b74913ccf02240ae572e09ad82.zip
prosody: More accurate friendly error message in the event that creating the global SSL context fails
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody8
1 files changed, 6 insertions, 2 deletions
diff --git a/prosody b/prosody
index 65d8dceb..55198c2f 100755
--- a/prosody
+++ b/prosody
@@ -221,8 +221,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