ejabberdsql2prosody: Allow for multiple INSERTs to the same table

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index 6ff399269b07d03171a156576ce0b5ea1b5a7ab5..6fe72712ae26e5f7700ff1275ade476132886f4d 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -190,7 +190,12 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
     end\r
     if not ssl then\r
       sslctx = false;\r
-      out_put("server.lua: ", "ssl not enabled on ", serverport);\r
+      if startssl then\r
+         out_error( "server.lua: Cannot start ssl on port: ", serverport )\r
+         return nil, "Cannot start ssl,  see log for details"\r
+       else\r
+         out_put("server.lua: ", "ssl not enabled on ", serverport);\r
+       end\r
     end\r
 \r
     local accept = socket.accept\r