Automated merge with http://waqas.ath.cx:8000/

1 files changed, 5 insertions, 4 deletions

diff --git a/prosody b/prosody
index 15c94c92..0e38c6c2 100755
--- a/prosody
+++ b/prosody
@@ -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"