aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-04-21 03:38:41 +0100
committerMatthew Wild <mwild1@gmail.com>2009-04-21 03:38:41 +0100
commit68c8c0a6b503af09c2b46f2285f6c7fd17d32f75 (patch)
treef836df884ebac25255da0851338adb54169858af /prosody
parent44084aa0c53b15e0c3c8d1e2d5408228f3156f3a (diff)
downloadprosody-68c8c0a6b503af09c2b46f2285f6c7fd17d32f75.tar.gz
prosody-68c8c0a6b503af09c2b46f2285f6c7fd17d32f75.zip
prosody: Remove logging code and instead load core.loggingmanager to set up logging
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody12
1 files changed, 6 insertions, 6 deletions
diff --git a/prosody b/prosody
index 78171ef7..49f982f3 100755
--- a/prosody
+++ b/prosody
@@ -59,22 +59,22 @@ do
end
end
-log = require "util.logger".init("general");
-
--- Disable log output, needs to read from config
--- require "util.logger".setwriter(function () end);
+--- Initialize logging
+require "core.loggingmanager"
+--- Check runtime dependencies
require "util.dependencies"
+--- Load socket framework
local server = require "net.server"
+
-- Maps connections to sessions --
sessions = {};
hosts = {};
--- Load and initialise core modules --
-
+--- Load and initialise core modules
require "util.import"
require "core.xmlhandlers"
require "core.rostermanager"