diff options
| author | Stefan Boberg <[email protected]> | 2021-09-15 13:18:34 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-15 13:18:34 +0200 |
| commit | ab95978c10258cab130ef7e6dc3f7cb7a1bf337d (patch) | |
| tree | a6e4ca55890f5b728f69ccf8878af98ba2e31bc9 /zencore | |
| parent | Added #ifdef condition around Windows-specific exception handling (diff) | |
| parent | Cross-platform zen::GetLastError() (diff) | |
| download | zen-ab95978c10258cab130ef7e6dc3f7cb7a1bf337d.tar.xz zen-ab95978c10258cab130ef7e6dc3f7cb7a1bf337d.zip | |
Merged from main
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/filesystem.cpp | 5 | ||||
| -rw-r--r-- | zencore/include/zencore/logging.h | 17 | ||||
| -rw-r--r-- | zencore/iobuffer.cpp | 4 | ||||
| -rw-r--r-- | zencore/logging.cpp | 10 |
4 files changed, 31 insertions, 5 deletions
diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp index 09c2e7386..329cc241d 100644 --- a/zencore/filesystem.cpp +++ b/zencore/filesystem.cpp @@ -5,6 +5,7 @@ #include <zencore/except.h> #include <zencore/fmtutils.h> #include <zencore/iobuffer.h> +#include <zencore/logging.h> #include <zencore/string.h> #include <zencore/windows.h> @@ -14,8 +15,6 @@ #include <winnt.h> #include <filesystem> -#include <spdlog/spdlog.h> - #include <gsl/gsl-lite.hpp> namespace zen { @@ -582,7 +581,7 @@ FileSystemTraversal::TraverseFileSystem(const std::filesystem::path& RootDir, Tr } else if (DirInfo->FileAttributes & FILE_ATTRIBUTE_DEVICE) { - spdlog::warn("encountered device node during file system traversal: {} found in {}", WideToUtf8(FileName), RootDir); + ZEN_WARN("encountered device node during file system traversal: {} found in {}", WideToUtf8(FileName), RootDir); } else { diff --git a/zencore/include/zencore/logging.h b/zencore/include/zencore/logging.h index a2404a5e9..eefed4efa 100644 --- a/zencore/include/zencore/logging.h +++ b/zencore/include/zencore/logging.h @@ -20,3 +20,20 @@ void InitializeLogging(); void ShutdownLogging(); } // namespace zen::logging + +namespace zen { +spdlog::logger& Log(); +using logging::ConsoleLog; +} // namespace zen + +using zen::ConsoleLog; +using zen::Log; + +// Helper macros for logging + +#define ZEN_TRACE(...) Log().trace(__VA_ARGS__) +#define ZEN_DEBUG(...) Log().debug(__VA_ARGS__) +#define ZEN_INFO(...) Log().info(__VA_ARGS__) +#define ZEN_WARN(...) Log().warn(__VA_ARGS__) +#define ZEN_ERROR(...) Log().error(__VA_ARGS__) +#define ZEN_CRITICAL(...) Log().critical(__VA_ARGS__) diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 9c7781663..14ba77ea6 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -6,12 +6,12 @@ #include <memory.h> #include <zencore/filesystem.h> #include <zencore/fmtutils.h> +#include <zencore/logging.h> #include <zencore/memory.h> #include <zencore/thread.h> #include <system_error> #include <atlfile.h> -#include <spdlog/spdlog.h> #include <gsl/gsl-lite.hpp> namespace zen { @@ -165,7 +165,7 @@ IoBufferExtendedCore::~IoBufferExtendedCore() if (!Success) { - spdlog::warn("Error reported on file handle close!"); + ZEN_WARN("Error reported on file handle close!"); } } diff --git a/zencore/logging.cpp b/zencore/logging.cpp index 6441fc3bc..9d5a726f5 100644 --- a/zencore/logging.cpp +++ b/zencore/logging.cpp @@ -4,6 +4,16 @@ #include <spdlog/sinks/stdout_color_sinks.h> +namespace zen { + +spdlog::logger& +Log() +{ + return *spdlog::default_logger(); +} + +} // namespace zen + namespace zen::logging { spdlog::logger& |