aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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"