Changeset

1017:6556a9db3822

prosody: Remove logging code and instead load core.loggingmanager to set up logging
author Matthew Wild <mwild1@gmail.com>
date Tue, 21 Apr 2009 03:38:41 +0100
parents 1016:73afe3e30e97
children 1018:686fbeb411e3 1020:8bf71f8bd0d1
files prosody
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/prosody	Tue Apr 21 03:37:49 2009 +0100
+++ b/prosody	Tue Apr 21 03:38:41 2009 +0100
@@ -59,22 +59,22 @@
 	end
 end
 
-log = require "util.logger".init("general");
+--- Initialize logging
+require "core.loggingmanager"
 
--- Disable log output, needs to read from config
--- require "util.logger".setwriter(function () end);
-
+--- 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"