From 6a5d207920f030e54710af12463f4a701c09b118 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 15 Sep 2021 10:15:24 +0200
Subject: Changed direct includes of spdlog/spdlog.h into zencore/logging.h to
 make it easier to tweak implementation

---
 zenserver/cache/structuredcachestore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zenserver/cache/structuredcachestore.cpp')

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>
-- 
cgit v1.2.3


From 2b9bed6635d95e15847c4d9b602e34d90e277d14 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Wed, 15 Sep 2021 11:27:48 +0200
Subject: Changed logging implementation

* Code should no longer directly `#include spdlog/spdlog.h`, instead use `#include <zencore/logging.h>`
* Instead of explicit calls to `spdlog::info(...)` and such please use the logging macros defined in `zencore/logging.h`. I.e `ZEN_INFO`, `ZEN_DEBUG`, `ZEN_TRACE`, `ZEN_ERROR`, `ZEN_CRITITCAL`
* The macros will pick up the "most local" logger via a `Log()` call to retrieve a logger instance. To override the default logger in a class please implement your own `Log()` function
---
 zenserver/cache/structuredcachestore.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'zenserver/cache/structuredcachestore.cpp')

diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 8c4bb65bb..018955e65 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -31,7 +31,7 @@ using namespace fmt::literals;
 
 ZenCacheStore::ZenCacheStore(zen::CasStore& Cas, const std::filesystem::path& RootDir) : m_DiskLayer{Cas, RootDir}
 {
-	spdlog::info("initializing structured cache at '{}'", RootDir);
+	ZEN_INFO("initializing structured cache at '{}'", RootDir);
 	zen::CreateDirectories(RootDir);
 }
 
@@ -85,7 +85,7 @@ ZenCacheStore::Put(std::string_view InBucket, const zen::IoHash& HashKey, const
 bool
 ZenCacheStore::DropBucket(std::string_view Bucket)
 {
-	spdlog::info("dropping bucket '{}'", Bucket);
+	ZEN_INFO("dropping bucket '{}'", Bucket);
 
 	// TODO: should ensure this is done atomically across all layers
 
@@ -93,7 +93,7 @@ ZenCacheStore::DropBucket(std::string_view Bucket)
 	const bool DiskDropped = m_DiskLayer.DropBucket(Bucket);
 	const bool AnyDropped  = MemDropped || DiskDropped;
 
-	spdlog::info("bucket '{}' was {}", Bucket, AnyDropped ? "dropped" : "not found");
+	ZEN_INFO("bucket '{}' was {}", Bucket, AnyDropped ? "dropped" : "not found");
 
 	return AnyDropped;
 }
-- 
cgit v1.2.3