util.startup: Initialize prosody.log / _G.log here instead of in loggingmanager to reduce dependencies

2 files changed, 5 insertions, 4 deletions

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index c281a17c..23aa8e64 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -20,9 +20,6 @@ local config = require "core.configmanager";
 local logger = require "util.logger";
 local prosody = prosody;
 
-_G.log = logger.init("general");
-prosody.log = logger.init("general");
-
 local _ENV = nil;
 -- luacheck: std none
 
diff --git a/util/startup.lua b/util/startup.lua
index 721af49e..0d7cb08a 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -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 @@ function startup.init_global_state()
 
 	prosody.arg = _G.arg;
 
+	_G.log = logger.init("general");
+	prosody.log = logger.init("general");
+
 	startup.detect_platform();
 	startup.detect_installed();
 	_G.prosody = prosody;