From e53e8aeec3b9db6bb3dc3d20fd856b73de4474bc Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Mon, 6 Jul 2020 12:17:18 +0200 Subject: [PATCH] Fix file sink and update fMinSeverity on its removal --- logger/Logger.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/logger/Logger.cxx b/logger/Logger.cxx index 7410d8b..72ed1ae 100644 --- a/logger/Logger.cxx +++ b/logger/Logger.cxx @@ -428,7 +428,7 @@ void Logger::UpdateMinSeverity() if (fFileSeverity == Severity::nolog) { fMinSeverity = fConsoleSeverity; } else { - fMinSeverity = std::min(fConsoleSeverity, fFileSeverity); + fMinSeverity = std::max(fConsoleSeverity, fFileSeverity); } for (auto& it : fCustomSinks) { @@ -544,6 +544,8 @@ void Logger::RemoveFileSink() lock_guard lock(fMtx); if (fFileStream.is_open()) { fFileStream.close(); + fFileSeverity = Severity::nolog; + UpdateMinSeverity(); } }