diff options
Diffstat (limited to 'src/zenserver/admin/admin.cpp')
| -rw-r--r-- | src/zenserver/admin/admin.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp index 83f33d4ea..00a5c79ed 100644 --- a/src/zenserver/admin/admin.cpp +++ b/src/zenserver/admin/admin.cpp @@ -5,6 +5,7 @@ #include <zencore/compactbinarybuilder.h> #include <zencore/fmtutils.h> #include <zencore/jobqueue.h> +#include <zencore/logging.h> #include <zencore/string.h> #if ZEN_WITH_TRACE @@ -23,10 +24,6 @@ #include <chrono> -ZEN_THIRD_PARTY_INCLUDES_START -#include <spdlog/spdlog.h> -ZEN_THIRD_PARTY_INCLUDES_END - namespace zen { HttpAdminService::HttpAdminService(GcScheduler& Scheduler, @@ -563,8 +560,8 @@ HttpAdminService::HttpAdminService(GcScheduler& Scheduler, m_Router.RegisterRoute( "logs", [this](HttpRouterRequest& Req) { - CbObjectWriter Obj; - spdlog::string_view_t LogLevel = spdlog::level::to_string_view(spdlog::get_level()); + CbObjectWriter Obj; + auto LogLevel = logging::level::ToStringView(logging::GetLogLevel()); Obj.AddString("loglevel", std::string_view(LogLevel.data(), LogLevel.size())); Obj.AddString("Logfile", PathToUtf8(m_LogPaths.AbsLogPath)); Obj.BeginObject("cache"); @@ -615,15 +612,15 @@ HttpAdminService::HttpAdminService(GcScheduler& Scheduler, } if (std::string Param(Params.GetValue("loglevel")); Param.empty() == false) { - spdlog::level::level_enum NewLevel = spdlog::level::from_str(Param); - spdlog::string_view_t LogLevel = spdlog::level::to_string_view(NewLevel); + logging::level::LogLevel NewLevel = logging::level::ParseLogLevelString(Param); + std::string_view LogLevel = logging::level::ToStringView(NewLevel); if (LogLevel != Param) { return Req.ServerRequest().WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, fmt::format("Invalid log level '{}'", Param)); } - spdlog::set_level(NewLevel); + logging::SetLogLevel(NewLevel); if (StringBuilder.Size() > 0) { StringBuilder.Append(", "); |