From 2cd31bef444c1ecae9b7e4ef7ca43b9f5dd4222d Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Thu, 11 May 2023 16:07:40 +0200
Subject: allow early logging (#292)

* if logging is not initialized, just log to console
* changelog
---
 src/zencore/include/zencore/logging.h | 4 ++++
 src/zenserver/zenserver.cpp           | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/zencore/include/zencore/logging.h b/src/zencore/include/zencore/logging.h
index c40af1310..6a8fd7254 100644
--- a/src/zencore/include/zencore/logging.h
+++ b/src/zencore/include/zencore/logging.h
@@ -31,6 +31,10 @@ extern spdlog::logger* TheDefaultLogger;
 inline spdlog::logger&
 Log()
 {
+	if (TheDefaultLogger == nullptr)
+	{
+		return zen::logging::ConsoleLog();
+	}
 	return *TheDefaultLogger;
 }
 
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 826924952..f9221ed0f 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -1095,7 +1095,7 @@ ZenEntryPoint::Run()
 		{
 			if (ServerOptions.OwnerPid)
 			{
-				ConsoleLog().info(
+				ZEN_INFO(
 					"Looks like there is already a process listening to this port {} (pid: {}), attaching owner pid {} to running instance",
 					ServerOptions.BasePort,
 					Entry->Pid,
@@ -1107,9 +1107,7 @@ ZenEntryPoint::Run()
 			}
 			else
 			{
-				ConsoleLog().warn("Exiting since there is already a process listening to port {} (pid: {})",
-								  ServerOptions.BasePort,
-								  Entry->Pid);
+				ZEN_WARN("Exiting since there is already a process listening to port {} (pid: {})", ServerOptions.BasePort, Entry->Pid);
 				std::exit(1);
 			}
 		}
@@ -1131,7 +1129,7 @@ ZenEntryPoint::Run()
 
 		if (Ec)
 		{
-			ConsoleLog().warn("ERROR: Unable to grab lock at '{}' (error: '{}')", LockFilePath, Ec.message());
+			ZEN_WARN("ERROR: Unable to grab lock at '{}' (error: '{}')", LockFilePath, Ec.message());
 
 			std::exit(99);
 		}
-- 
cgit v1.2.3