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 --- zen/cmds/cache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zen/cmds/cache.cpp') diff --git a/zen/cmds/cache.cpp b/zen/cmds/cache.cpp index 3f4a4cdc3..aaf67e416 100644 --- a/zen/cmds/cache.cpp +++ b/zen/cmds/cache.cpp @@ -3,10 +3,10 @@ #include "cache.h" #include +#include #include #include -#include #include // cpr //////////////////////////////////////////////////////////////////// -- 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 --- zen/cmds/cache.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zen/cmds/cache.cpp') diff --git a/zen/cmds/cache.cpp b/zen/cmds/cache.cpp index aaf67e416..69e500293 100644 --- a/zen/cmds/cache.cpp +++ b/zen/cmds/cache.cpp @@ -39,7 +39,7 @@ DropCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) m_Options.parse_positional({"bucket", "positional"}); m_Options.parse(argc, argv); - spdlog::info("Dropping cache bucket '{}' from '{}'", m_BucketName, m_HostName); + ZEN_INFO("Dropping cache bucket '{}' from '{}'", m_BucketName, m_HostName); cpr::Session Session; Session.SetUrl({"{}/z$/{}"_format(m_HostName, m_BucketName)}); @@ -47,18 +47,18 @@ DropCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) if (zen::IsHttpSuccessCode(Result.status_code)) { - spdlog::info("OK: dropped cache bucket '{}' from '{}'", m_BucketName, m_HostName); + ZEN_INFO("OK: dropped cache bucket '{}' from '{}'", m_BucketName, m_HostName); return 0; } if (Result.status_code) { - spdlog::error("Drop failed: {}: {} ({})", Result.status_code, Result.reason, Result.text); + ZEN_ERROR("Drop failed: {}: {} ({})", Result.status_code, Result.reason, Result.text); } else { - spdlog::error("Drop failed: {}", Result.error.message); + ZEN_ERROR("Drop failed: {}", Result.error.message); } return 1; -- cgit v1.2.3