Skip to content

Commit f723016

Browse files
committed
Simplify Logger::Prefix (function that adds prefix)
1 parent 1250369 commit f723016

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/common/Log.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ namespace Log {
4545
Logger::Logger(Str::StringRef name, std::string prefix, Level defaultLevel)
4646
: filterLevel(new Cvar::Cvar<Log::Level>(
4747
"logs.level." + name, "Log::Level - logs from '" + name + "' below the level specified are filtered", 0, defaultLevel)),
48-
prefix(prefix), enableSuppression(true) {
48+
enableSuppression(true)
49+
{
50+
if (!prefix.empty()) {
51+
// TODO allow prefixes without a space, e.g. a color code
52+
this->prefix = prefix + " ";
53+
}
4954
}
5055

51-
std::string Logger::Prefix(std::string message) const {
52-
if (prefix.empty()) {
53-
return message;
54-
} else {
55-
return prefix + " " + message;
56-
}
56+
std::string Logger::Prefix(Str::StringRef message) const {
57+
return prefix + message;
5758
}
5859

5960
void Logger::Dispatch(std::string message, Log::Level level, Str::StringRef format) {

src/common/Log.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace Log {
118118
private:
119119
void Dispatch(std::string message, Log::Level level, Str::StringRef format);
120120

121-
std::string Prefix(std::string message) const;
121+
std::string Prefix(Str::StringRef message) const;
122122

123123
// the cvar logs.level.<name>
124124
std::shared_ptr<Cvar::Cvar<Level>> filterLevel;

0 commit comments

Comments
 (0)