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/vfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zenserver/vfs.cpp')

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")
 
-- 
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/vfs.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'zenserver/vfs.cpp')

diff --git a/zenserver/vfs.cpp b/zenserver/vfs.cpp
index d9795a6a1..86e265b20 100644
--- a/zenserver/vfs.cpp
+++ b/zenserver/vfs.cpp
@@ -54,7 +54,7 @@ public:
 		HRESULT	 hRes = ManifestFile.Create(ManifestSpec.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING);
 		if (FAILED(hRes))
 		{
-			spdlog::error("MANIFEST NOT FOUND!");  // TODO: add context
+			ZEN_ERROR("MANIFEST NOT FOUND!");  // TODO: add context
 
 			return hRes;
 		}
@@ -588,11 +588,11 @@ retry:
 
 	if (SUCCEEDED(hRes))
 	{
-		spdlog::info("Successfully mounted snapshot at '{}'!", WideToUtf8(RootPath.c_str()));
+		ZEN_INFO("Successfully mounted snapshot at '{}'!", WideToUtf8(RootPath.c_str()));
 	}
 	else
 	{
-		spdlog::info("Failed mounting snapshot at '{}'!", WideToUtf8(RootPath.c_str()));
+		ZEN_INFO("Failed mounting snapshot at '{}'!", WideToUtf8(RootPath.c_str()));
 	}
 
 	return hRes;
-- 
cgit v1.2.3