Changed direct includes of spdlog/spdlog.h into zencore/logging.h to make it easier to tweak implementation

15 files changed, 20 insertions, 22 deletions

diff --git a/zenserver/cache/cachestore.cpp b/zenserver/cache/cachestore.cpp
index 9180835d9..44aa4c892 100644
--- a/zenserver/cache/cachestore.cpp
+++ b/zenserver/cache/cachestore.cpp
@@ -4,6 +4,7 @@
 
 #include <zencore/crc32.h>
 #include <zencore/except.h>
+#include <zencore/logging.h>
 #include <zencore/windows.h>
 
 #include <zencore/filesystem.h>
@@ -16,7 +17,6 @@
 #include <zenstore/caslog.h>
 
 #include <fmt/core.h>
-#include <spdlog/spdlog.h>
 #include <concepts>
 #include <filesystem>
 #include <gsl/gsl-lite.hpp>
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 3fbdfb30e..196a4b66c 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -37,7 +37,7 @@ HttpStructuredCacheService::HttpStructuredCacheService(::ZenCacheStore&				  InC
 , m_CidStore(InCidStore)
 , m_UpstreamCache(std::move(UpstreamCache))
 {
-	//m_Log.set_level(spdlog::level::debug);
+	// m_Log.set_level(spdlog::level::debug);
 }
 
 HttpStructuredCacheService::~HttpStructuredCacheService()
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index a07fccf98..8c4bb65bb 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -9,6 +9,7 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/iobuffer.h>
+#include <zencore/logging.h>
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zenstore/basicfile.h>
@@ -16,7 +17,6 @@
 #include <zenstore/caslog.h>
 
 #include <fmt/core.h>
-#include <spdlog/spdlog.h>
 #include <concepts>
 #include <filesystem>
 #include <gsl/gsl-lite.hpp>
diff --git a/zenserver/casstore.cpp b/zenserver/casstore.cpp
index 6f1e4873b..194edf4a1 100644
--- a/zenserver/casstore.cpp
+++ b/zenserver/casstore.cpp
@@ -3,8 +3,8 @@
 #include "casstore.h"
 
 #include <zencore/streamutil.h>
+#include <zencore/logging.h>
 
-#include <spdlog/spdlog.h>
 #include <gsl/gsl-lite.hpp>
 
 namespace zen {
diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index abd69be25..49e7017a9 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -14,7 +14,7 @@
 #pragma warning(pop)
 
 #include <fmt/format.h>
-#include <spdlog/spdlog.h>
+#include <zencore/logging.h>
 #include <sol/sol.hpp>
 
 #if ZEN_PLATFORM_WINDOWS
@@ -59,7 +59,9 @@ void
 ParseGlobalCliOptions(int argc, char* argv[], ZenServerOptions& GlobalOptions, ZenServiceConfig& ServiceConfig)
 {
 	cxxopts::Options options("zenserver", "Zen Server");
-	options.add_options()("dedicated", "Enable dedicated server mode", cxxopts::value<bool>(GlobalOptions.IsDedicated)->default_value("false"));
+	options.add_options()("dedicated",
+						  "Enable dedicated server mode",
+						  cxxopts::value<bool>(GlobalOptions.IsDedicated)->default_value("false"));
 	options.add_options()("d, debug", "Enable debugging", cxxopts::value<bool>(GlobalOptions.IsDebug)->default_value("false"));
 	options.add_options()("help", "Show command line help");
 	options.add_options()("t, test", "Enable test mode", cxxopts::value<bool>(GlobalOptions.IsTest)->default_value("false"));
diff --git a/zenserver/experimental/usnjournal.cpp b/zenserver/experimental/usnjournal.cpp
index 0553945dd..b23794b42 100644
--- a/zenserver/experimental/usnjournal.cpp
+++ b/zenserver/experimental/usnjournal.cpp
@@ -5,8 +5,7 @@
 #include <zencore/except.h>
 #include <zencore/timer.h>
 #include <zencore/zencore.h>
-
-#include <spdlog/spdlog.h>
+#include <zencore/logging.h>
 
 #include <atlfile.h>
 
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index de1d90ef9..824dab090 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -788,7 +788,7 @@ ProjectStore::ProjectStore(CasStore& Store, std::filesystem::path BasePath)
 , m_CasStore(Store)
 {
 	m_Log.info("initializing project store at '{}'", BasePath);
-	//m_Log.set_level(spdlog::level::debug);
+	// m_Log.set_level(spdlog::level::debug);
 }
 
 ProjectStore::~ProjectStore()
diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h
index 3068c61b4..c632264d0 100644
--- a/zenserver/projectstore.h
+++ b/zenserver/projectstore.h
@@ -8,8 +8,8 @@
 #include <zenstore/cas.h>
 #include <zenstore/caslog.h>
 
-#include <spdlog/spdlog.h>
 #include <tsl/robin_map.h>
+#include <zencore/logging.h>
 #include <filesystem>
 #include <map>
 #include <optional>
diff --git a/zenserver/sos/sos.cpp b/zenserver/sos/sos.cpp
index ce0a8f6b1..5fa6ffaae 100644
--- a/zenserver/sos/sos.cpp
+++ b/zenserver/sos/sos.cpp
@@ -6,8 +6,7 @@
 
 namespace zen {
 
-HttpCommonStructuredObjectStore::HttpCommonStructuredObjectStore()
-: m_Log(logging::Get("sos"))
+HttpCommonStructuredObjectStore::HttpCommonStructuredObjectStore() : m_Log(logging::Get("sos"))
 {
 	m_Router.AddPattern("ns", "([[:alnum:]_-.]+)");
 	m_Router.AddPattern("bucket", "([[:alnum:]_-.]+)");
@@ -30,4 +29,4 @@ HttpCommonStructuredObjectStore::HandleRequest(zen::HttpServerRequest& HttpServi
 	ZEN_UNUSED(HttpServiceRequest);
 }
 
-}
+}  // namespace zen
diff --git a/zenserver/sos/sos.h b/zenserver/sos/sos.h
index 6e6a5f26a..e602df8c4 100644
--- a/zenserver/sos/sos.h
+++ b/zenserver/sos/sos.h
@@ -31,4 +31,4 @@ private:
 	zen::HttpRequestRouter m_Router;
 };
 
-}
+}  // namespace zen
diff --git a/zenserver/testing/httptest.h b/zenserver/testing/httptest.h
index 5809d4e2e..e174faf62 100644
--- a/zenserver/testing/httptest.h
+++ b/zenserver/testing/httptest.h
@@ -3,8 +3,7 @@
 #pragma once
 
 #include <zenhttp/httpserver.h>
-
-#include <spdlog/spdlog.h>
+#include <zencore/logging.h>
 
 namespace zen {
 
diff --git a/zenserver/testing/launch.h b/zenserver/testing/launch.h
index 001615499..f38e62192 100644
--- a/zenserver/testing/launch.h
+++ b/zenserver/testing/launch.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <zenhttp/httpserver.h>
+#include <zencore/logging.h>
 
-#include <spdlog/spdlog.h>
 #include <filesystem>
 
 namespace zen {
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index 9f36704fa..5efe52b77 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -5,8 +5,7 @@
 #include <zencore/refcount.h>
 #include <zencore/thread.h>
 #include <zenhttp/httpserver.h>
-
-#include <spdlog/spdlog.h>
+#include <zencore/logging.h>
 
 #include <atomic>
 #include <list>
diff --git a/zenserver/vfs.cpp b/zenserver/vfs.cpp
index 18d8f1842..d9795a6a1 100644
--- a/zenserver/vfs.cpp
+++ b/zenserver/vfs.cpp
@@ -8,13 +8,13 @@
 #	include <zencore/snapshot_manifest.h>
 #	include <zencore/stream.h>
 #	include <zencore/windows.h>
+#	include <zencore/logging.h>
 #	include <zenstore/CAS.h>
 
 #	include <map>
 
 #	include <atlfile.h>
 #	include <projectedfslib.h>
-#	include <spdlog/spdlog.h>
 
 #	pragma comment(lib, "projectedfslib.lib")
 
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 2545ed7a2..f1a3ca05f 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -3,6 +3,7 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/iobuffer.h>
+#include <zencore/logging.h>
 #include <zencore/refcount.h>
 #include <zencore/scopeguard.h>
 #include <zencore/string.h>
@@ -17,7 +18,6 @@
 #include <fmt/format.h>
 #include <mimalloc-new-delete.h>
 #include <mimalloc.h>
-#include <spdlog/spdlog.h>
 #include <asio.hpp>
 #include <exception>
 #include <list>
@@ -361,7 +361,7 @@ public:
 
 private:
 	bool				  m_IsDedicatedMode = false;
-	bool				  m_TestMode	= false;
+	bool				  m_TestMode		= false;
 	std::filesystem::path m_DataRoot;
 	std::jthread		  m_IoRunner;
 	asio::io_context	  m_IoContext;