Changeset

2859:460681180194

prosody: More accurate friendly error message in the event that creating the global SSL context fails
author Matthew Wild <mwild1@gmail.com>
date Sat, 13 Feb 2010 16:22:05 +0000
parents 2858:d08771a2f617
children 2860:ad534f89c758
files prosody
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/prosody	Fri Feb 12 17:27:53 2010 +0000
+++ b/prosody	Sat Feb 13 16:22:05 2010 +0000
@@ -221,8 +221,12 @@
 						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