--- a/core/loggingmanager.lua	Thu Apr 05 17:41:00 2018 +0200
+++ b/core/loggingmanager.lua	Thu Apr 05 17:52:37 2018 +0200
@@ -20,9 +20,6 @@
 local logger = require "util.logger";
 local prosody = prosody;
 
-_G.log = logger.init("general");
-prosody.log = logger.init("general");
-
 local _ENV = nil;
 -- luacheck: std none
 

--- a/util/startup.lua	Thu Apr 05 17:41:00 2018 +0200
+++ b/util/startup.lua	Thu Apr 05 17:52:37 2018 +0200
@@ -3,7 +3,8 @@
 local startup = {};
 
 local prosody = { events = require "util.events".new() };
-local log = require "util.logger".init("startup");
+local logger = require "util.logger";
+local log = logger.init("startup");
 
 local config = require "core.configmanager";
 
@@ -195,6 +196,9 @@
 
 	prosody.arg = _G.arg;
 
+	_G.log = logger.init("general");
+	prosody.log = logger.init("general");
+
 	startup.detect_platform();
 	startup.detect_installed();
 	_G.prosody = prosody;