Merged with main tip.

1 files changed, 24 insertions, 4 deletions

diff --git a/prosody b/prosody
index 197446e6..15c94c92 100755
--- a/prosody
+++ b/prosody
@@ -7,14 +7,14 @@
 -- COPYING file in the source package for more information.
 --
 
--- Config here --
+-- Will be modified by configure script if run --
 
 CFG_SOURCEDIR=nil;
 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
 CFG_PLUGINDIR=nil;
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
--- -- -- -- -- --
+-- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
 	package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
@@ -84,7 +84,9 @@ require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
 
---[[
+-- Commented to protect us from 
+-- the second kind of people
+--[[ 
 pcall(require, "remdebug.engine");
 if remdebug then remdebug.engine.start() end
 ]]
@@ -104,6 +106,7 @@ require "util.datamanager".set_data_path(data_path);
 
 ----------- End of out-of-place code --------------
 
+
 eventmanager.fire_event("server-starting");
 
 
@@ -148,4 +151,21 @@ end
 
 eventmanager.fire_event("server-started");
 
-server.loop();
+local quitting;
+while not quitting do
+	xpcall(server.loop, function (err)
+					if err:match("%d*: interrupted!$") then
+						quitting = true;
+						return;
+					end
+
+					log("error", "Top-level error, please report:\n%s", tostring(err));
+
+					local traceback = debug.traceback("", 2);
+					if traceback then
+						log("error", "%s", traceback);
+					end
+					
+					eventmanager.fire_event("very-bad-error", "*", err, traceback);
+				end);
+end