util.logger: Small code tidying :)

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 197446e639e83a275855531bed9a73fdbd141a6c..0e38c6c2d988c768f67c2b9e6600d7484febfa2a 100755 (executable)
--- 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
@@ -32,10 +32,6 @@ pcall(require, "luarocks.require")
 
 
 config = require "core.configmanager"
-log = require "util.logger".init("general");
-
--- Disable log output, needs to read from config
--- require "util.logger".setwriter(function () end);
 
 do
        -- TODO: Check for other formats when we add support for them
@@ -63,6 +59,11 @@ do
        end
 end
 
+log = require "util.logger".init("general");
+
+-- Disable log output, needs to read from config
+-- require "util.logger".setwriter(function () end);
+
 require "util.dependencies"
 
 local server = require "net.server"
@@ -84,7 +85,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 +107,7 @@ require "util.datamanager".set_data_path(data_path);
 
 ----------- End of out-of-place code --------------
 
+
 eventmanager.fire_event("server-starting");
 
 
@@ -148,4 +152,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