Merge branch 'main' of https://github.com/EpicGames/zen

5 files changed, 75 insertions, 1 deletions

diff --git a/zencore/httpserver.cpp b/zencore/httpserver.cpp
index aa7d96772..d7e6a875f 100644
--- a/zencore/httpserver.cpp
+++ b/zencore/httpserver.cpp
@@ -13,6 +13,7 @@
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarypackage.h>
 #include <zencore/iobuffer.h>
+#include <zencore/logging.h>
 #include <zencore/refcount.h>
 #include <zencore/stream.h>
 #include <zencore/string.h>
@@ -965,7 +966,7 @@ HttpSysServer::Run(bool TestMode)
 {
 	if (TestMode == false)
 	{
-		printf("Zen Server running. Press ESC or Q to quit\n");
+		zen::logging::ConsoleLog().info("Zen Server running. Press ESC or Q to quit");
 	}
 
 	do
diff --git a/zencore/include/zencore/logging.h b/zencore/include/zencore/logging.h
index e77314178..7a08cc48b 100644
--- a/zencore/include/zencore/logging.h
+++ b/zencore/include/zencore/logging.h
@@ -7,3 +7,17 @@
 #include <spdlog/spdlog.h>
 #include "postwindows.h"
 // clang-format on
+
+#include <string_view>
+
+namespace zen::logging {
+
+spdlog::logger& Default();
+spdlog::logger& ConsoleLog();
+spdlog::logger& Get(std::string_view Name);
+
+void InitializeLogging();
+void ShutdownLogging();
+
+
+}  // namespace zen::logging
diff --git a/zencore/logging.cpp b/zencore/logging.cpp
new file mode 100644
index 000000000..89d588650
--- /dev/null
+++ b/zencore/logging.cpp
@@ -0,0 +1,57 @@
+#include "zencore/logging.h"
+
+#include <spdlog/sinks/stdout_color_sinks.h>
+
+namespace zen::logging {
+
+spdlog::logger&
+Default()
+{
+	return *spdlog::default_logger();
+}
+
+spdlog::logger&
+Get(std::string_view Name)
+{
+	std::shared_ptr<spdlog::logger> Logger = spdlog::get(std::string(Name));
+	if (!Logger)
+	{
+		Logger = std::make_shared<spdlog::logger>(std::string(Name),
+												  begin(spdlog::default_logger()->sinks()),
+												  end(spdlog::default_logger()->sinks()));
+
+		Logger->set_level(spdlog::default_logger()->level());
+		spdlog::register_logger(Logger);
+	}
+
+	return *Logger;
+}
+
+std::once_flag					ConsoleInitFlag;
+std::shared_ptr<spdlog::logger> ConLogger;
+
+spdlog::logger&
+ConsoleLog()
+{
+	std::call_once(ConsoleInitFlag, [&] {
+		ConLogger = spdlog::stdout_color_mt("console");
+
+		ConLogger->set_pattern("%v");
+	});
+
+	return *ConLogger;
+}
+
+void 
+InitializeLogging()
+{
+}
+
+void 
+ShutdownLogging()
+{
+	spdlog::drop_all();
+	spdlog::shutdown();
+}
+
+}  // namespace zen::logging
diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj
index 6da8794b3..bf35f8f5a 100644
--- a/zencore/zencore.vcxproj
+++ b/zencore/zencore.vcxproj
@@ -167,6 +167,7 @@
     <ClCompile Include="httpserver.cpp" />
     <ClCompile Include="iohash.cpp" />
     <ClCompile Include="iothreadpool.cpp" />
+    <ClCompile Include="logging.cpp" />
     <ClCompile Include="md5.cpp" />
     <ClCompile Include="memory.cpp" />
     <ClCompile Include="refcount.cpp" />
diff --git a/zencore/zencore.vcxproj.filters b/zencore/zencore.vcxproj.filters
index 8b105fc31..b1b1b9359 100644
--- a/zencore/zencore.vcxproj.filters
+++ b/zencore/zencore.vcxproj.filters
@@ -76,6 +76,7 @@
     <ClCompile Include="compress.cpp" />
     <ClCompile Include="compositebuffer.cpp" />
     <ClCompile Include="crc32.cpp" />
+    <ClCompile Include="logging.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CAS">