From 6a5d207920f030e54710af12463f4a701c09b118 Mon Sep 17 00:00:00 2001 From: Stefan Boberg 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/casstore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zenserver/casstore.cpp') 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 +#include -#include #include namespace zen { -- cgit v1.2.3 From 2b9bed6635d95e15847c4d9b602e34d90e277d14 Mon Sep 17 00:00:00 2001 From: Stefan Boberg 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 ` * 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/casstore.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'zenserver/casstore.cpp') diff --git a/zenserver/casstore.cpp b/zenserver/casstore.cpp index 194edf4a1..b36dcc09f 100644 --- a/zenserver/casstore.cpp +++ b/zenserver/casstore.cpp @@ -2,8 +2,8 @@ #include "casstore.h" -#include #include +#include #include @@ -63,7 +63,7 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store) "{cas}", [this](HttpRouterRequest& Req) { IoHash Hash = IoHash::FromHexString(Req.GetCapture(1)); - spdlog::debug("CAS request for {}", Hash); + ZEN_DEBUG("CAS request for {}", Hash); HttpServerRequest& ServerRequest = Req.ServerRequest(); @@ -123,7 +123,7 @@ HttpCasService::HandleRequest(zen::HttpServerRequest& Request) IoBuffer Payload = Request.ReadPayload(); IoHash PayloadHash = IoHash::HashBuffer(Payload.Data(), Payload.Size()); - spdlog::debug("CAS POST request for {} ({} bytes)", PayloadHash, Payload.Size()); + ZEN_DEBUG("CAS POST request for {} ({} bytes)", PayloadHash, Payload.Size()); auto InsertResult = m_CasStore.InsertChunk(Payload, PayloadHash); -- cgit v1.2.3