Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/include/logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,20 @@ class Logger {
std::array<std::string, sizeof...(args)> argStrings = {toStringHelper(std::forward<Args>(args))...};

std::stringstream ss;
std::string formattedHeader = header_;
size_t argIndex = 0;
size_t pos = 0;

// Replace "%@" placeholders
while ((pos = formattedHeader.find("%@", pos)) != std::string::npos && argIndex < argStrings.size()) {
formattedHeader.replace(pos, 2, argStrings[argIndex]);
pos += argStrings[argIndex].length();
++argIndex;
// Replace "%@" placeholders by iterating through header_
for (size_t i = 0; i < header_.size(); ++i) {
if (i + 1 < header_.size() && header_[i] == '%' && header_[i + 1] == '@' &&
argIndex < argStrings.size()) {
ss << argStrings[argIndex];
++argIndex;
++i; // Skip the '@' character
} else {
ss << header_[i];
}
}

ss << formattedHeader;

// Append remaining arguments
for (size_t i = argIndex; i < argStrings.size(); ++i) {
if (delimiter_) {
Expand Down