projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessionmanager, s2smanager: Give sessions dummy data handlers that log when data...
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 05d91b7d0bb8f2da4b9eefb208837dcef8735e9c..65d8dceb17201bae80e1663207df8c4b6e1f2d6e 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-215,9
+215,14
@@
function init_global_state()
elseif port == 5280 then
friendly_message = "check that Prosody or a BOSH connection manager "
.."is not already running";
elseif port == 5280 then
friendly_message = "check that Prosody or a BOSH connection manager "
.."is not already running";
+ else
+ friendly_message = "this port is in use by another application";
end
elseif err:match("permission") then
friendly_message = "Prosody does not have sufficient privileges to use this port";
end
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";
end
log("error", "Failed to open server port %d, %s", port, friendly_message);
end
end
log("error", "Failed to open server port %d, %s", port, friendly_message);
end