diff options
Diffstat (limited to 'src/zenserver/cache')
| -rw-r--r-- | src/zenserver/cache/httpstructuredcache.h | 8 | ||||
| -rw-r--r-- | src/zenserver/cache/structuredcachestore.cpp | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/zenserver/cache/httpstructuredcache.h b/src/zenserver/cache/httpstructuredcache.h index 75ae1711f..57a533029 100644 --- a/src/zenserver/cache/httpstructuredcache.h +++ b/src/zenserver/cache/httpstructuredcache.h @@ -12,10 +12,6 @@ #include <memory> #include <vector> -namespace spdlog { -class logger; -} - namespace zen { struct CacheChunkRequest; @@ -178,8 +174,8 @@ private: bool AreDiskWritesAllowed() const; - spdlog::logger& Log() { return m_Log; } - spdlog::logger& m_Log; + LoggerRef Log() { return m_Log; } + LoggerRef m_Log; ZenCacheStore& m_CacheStore; HttpStatsService& m_StatsService; HttpStatusService& m_StatusService; diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp index db6156ea1..236a0e1d7 100644 --- a/src/zenserver/cache/structuredcachestore.cpp +++ b/src/zenserver/cache/structuredcachestore.cpp @@ -40,6 +40,7 @@ ZEN_THIRD_PARTY_INCLUDES_END # include <zencore/workthreadpool.h> # include <zenstore/cidstore.h> # include <random> +# include <unordered_map> #endif namespace zen { @@ -310,9 +311,9 @@ ZenCacheStore::LogWorker() { SetCurrentThreadName("ZenCacheStore::LogWorker"); - spdlog::logger& ZCacheLog(logging::Get("z$")); + LoggerRef ZCacheLog(logging::Get("z$")); - auto Log = [&ZCacheLog]() { return ZCacheLog; }; + auto Log = [&ZCacheLog]() -> LoggerRef { return ZCacheLog; }; std::vector<AccessLogItem> Items; while (true) |