Mirror/FairLogger
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairLogger.git synced 2025-10-13 00:31:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to fmt's deprecation of format_to memory buffer overload

Browse Source
This commit is contained in:
Alexey Rybalchenko 2021-11-26 11:03:04 +01:00
parent 27040ea292
commit 9a6644c931
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
logger/Logger.cxx
View File

@ -15,6 +15,7 @@
#include <cstdio> // printf #include <cstdio> // printf
#include <iostream> #include <iostream>
#include <iterator> // std::back_inserter
using namespace std; using namespace std;
@ -160,27 +161,27 @@ Logger::Logger(Severity severity, Verbosity verbosity, const string& file, const
for (const auto info : spec.fInfos) { for (const auto info : spec.fInfos) {
switch (info) { switch (info) {
case VSpec::Info::process_name: case VSpec::Info::process_name:
fmt::format_to(fBWPrefix, "[{}]", fInfos.process_name); fmt::format_to(std::back_inserter(fBWPrefix), "[{}]", fInfos.process_name);
break; break;
case VSpec::Info::timestamp_us: case VSpec::Info::timestamp_us:
FillTimeInfos(); FillTimeInfos();
fmt::format_to(fBWPrefix, "[{:%H:%M:%S}.{:06}]", fmt::localtime(fInfos.timestamp), fInfos.us.count()); fmt::format_to(std::back_inserter(fBWPrefix), "[{:%H:%M:%S}.{:06}]", fmt::localtime(fInfos.timestamp), fInfos.us.count());
break; break;
case VSpec::Info::timestamp_s: case VSpec::Info::timestamp_s:
FillTimeInfos(); FillTimeInfos();
fmt::format_to(fBWPrefix, "[{:%H:%M:%S}]", fmt::localtime(fInfos.timestamp)); fmt::format_to(std::back_inserter(fBWPrefix), "[{:%H:%M:%S}]", fmt::localtime(fInfos.timestamp));
break; break;
case VSpec::Info::severity: case VSpec::Info::severity:
fmt::format_to(fBWPrefix, "[{}]", fInfos.severity_name); fmt::format_to(std::back_inserter(fBWPrefix), "[{}]", fInfos.severity_name);
break; break;
case VSpec::Info::file_line_function: case VSpec::Info::file_line_function:
fmt::format_to(fBWPrefix, "[{}:{}:{}]", fInfos.file, fInfos.line, fInfos.func); fmt::format_to(std::back_inserter(fBWPrefix), "[{}:{}:{}]", fInfos.file, fInfos.line, fInfos.func);
break; break;
case VSpec::Info::file_line: case VSpec::Info::file_line:
fmt::format_to(fBWPrefix, "[{}:{}]", fInfos.file, fInfos.line); fmt::format_to(std::back_inserter(fBWPrefix), "[{}:{}]", fInfos.file, fInfos.line);
break; break;
case VSpec::Info::file: case VSpec::Info::file:
fmt::format_to(fBWPrefix, "[{}]", fInfos.file); fmt::format_to(std::back_inserter(fBWPrefix), "[{}]", fInfos.file);
break; break;
default: default:
break; break;
@ -188,7 +189,7 @@ Logger::Logger(Severity severity, Verbosity verbosity, const string& file, const
} }
if (spec.fSize > 0) { if (spec.fSize > 0) {
fmt::format_to(fBWPrefix, " "); fmt::format_to(std::back_inserter(fBWPrefix), " ");
} }
} }
@ -196,27 +197,27 @@ Logger::Logger(Severity severity, Verbosity verbosity, const string& file, const
for (const auto info : spec.fInfos) { for (const auto info : spec.fInfos) {
switch (info) { switch (info) {
case VSpec::Info::process_name: case VSpec::Info::process_name:
fmt::format_to(fColorPrefix, "[{}]", ColorOut(Color::fgBlue, fInfos.process_name)); fmt::format_to(std::back_inserter(fColorPrefix), "[{}]", ColorOut(Color::fgBlue, fInfos.process_name));
break; break;
case VSpec::Info::timestamp_us: case VSpec::Info::timestamp_us:
FillTimeInfos(); FillTimeInfos();
fmt::format_to(fColorPrefix, "[{}{:%H:%M:%S}.{:06}{}]", startColor(Color::fgCyan), fmt::localtime(fInfos.timestamp), fInfos.us.count(), endColor()); fmt::format_to(std::back_inserter(fColorPrefix), "[{}{:%H:%M:%S}.{:06}{}]", startColor(Color::fgCyan), fmt::localtime(fInfos.timestamp), fInfos.us.count(), endColor());
break; break;
case VSpec::Info::timestamp_s: case VSpec::Info::timestamp_s:
FillTimeInfos(); FillTimeInfos();
fmt::format_to(fColorPrefix, "[{}{:%H:%M:%S}{}]", startColor(Color::fgCyan), fmt::localtime(fInfos.timestamp), endColor()); fmt::format_to(std::back_inserter(fColorPrefix), "[{}{:%H:%M:%S}{}]", startColor(Color::fgCyan), fmt::localtime(fInfos.timestamp), endColor());
break; break;
case VSpec::Info::severity: case VSpec::Info::severity:
fmt::format_to(fColorPrefix, "[{}]", GetColoredSeverityString(fInfos.severity)); fmt::format_to(std::back_inserter(fColorPrefix), "[{}]", GetColoredSeverityString(fInfos.severity));
break; break;
case VSpec::Info::file_line_function: case VSpec::Info::file_line_function:
fmt::format_to(fColorPrefix, "[{}:{}:{}]", ColorOut(Color::fgBlue, fInfos.file), ColorOut(Color::fgYellow, fInfos.line), ColorOut(Color::fgBlue, fInfos.func)); fmt::format_to(std::back_inserter(fColorPrefix), "[{}:{}:{}]", ColorOut(Color::fgBlue, fInfos.file), ColorOut(Color::fgYellow, fInfos.line), ColorOut(Color::fgBlue, fInfos.func));
break; break;
case VSpec::Info::file_line: case VSpec::Info::file_line:
fmt::format_to(fColorPrefix, "[{}:{}]", ColorOut(Color::fgBlue, fInfos.file), ColorOut(Color::fgYellow, fInfos.line)); fmt::format_to(std::back_inserter(fColorPrefix), "[{}:{}]", ColorOut(Color::fgBlue, fInfos.file), ColorOut(Color::fgYellow, fInfos.line));
break; break;
case VSpec::Info::file: case VSpec::Info::file:
fmt::format_to(fColorPrefix, "[{}]", ColorOut(Color::fgBlue, fInfos.file)); fmt::format_to(std::back_inserter(fColorPrefix), "[{}]", ColorOut(Color::fgBlue, fInfos.file));
break; break;
default: default:
break; break;
@ -224,7 +225,7 @@ Logger::Logger(Severity severity, Verbosity verbosity, const string& file, const
} }
if (spec.fSize > 0) { if (spec.fSize > 0) {
fmt::format_to(fColorPrefix, " "); fmt::format_to(std::back_inserter(fColorPrefix), " ");
} }
} }