Major change to log_msg - contain only string_view instead of buffer

This commit is contained in:
gabime
2018-10-19 02:15:50 +03:00
parent abf4af2645
commit 6355e9895d
9 changed files with 71 additions and 100 deletions

View File

@@ -38,7 +38,8 @@ class name_formatter : public flag_formatter
{
void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
{
fmt_helper::append_str(*msg.logger_name, dest);
// fmt_helper::append_str(*msg.logger_name, dest);
fmt_helper::append_string_view(*msg.logger_name, dest);
}
};
@@ -47,7 +48,8 @@ class level_formatter : public flag_formatter
{
void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(level::to_c_str(msg.level), dest);
// fmt_helper::append_string_view(level::to_c_str(msg.level), dest);
fmt_helper::append_string_view(level::to_c_str(msg.level), dest);
}
};
@@ -56,7 +58,8 @@ class short_level_formatter : public flag_formatter
{
void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(level::to_short_c_str(msg.level), dest);
// fmt_helper::append_string_view(level::to_short_c_str(msg.level), dest);
fmt_helper::append_string_view(level::to_short_c_str(msg.level), dest);
}
};
@@ -80,7 +83,8 @@ class a_formatter : public flag_formatter
{
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(days[tm_time.tm_wday], dest);
// fmt_helper::append_string_view(days[tm_time.tm_wday], dest);
fmt_helper::append_string_view(days[tm_time.tm_wday], dest);
}
};
@@ -90,7 +94,8 @@ class A_formatter : public flag_formatter
{
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(full_days[tm_time.tm_wday], dest);
// fmt_helper::append_string_view(full_days[tm_time.tm_wday], dest);
fmt_helper::append_string_view(full_days[tm_time.tm_wday], dest);
}
};
@@ -100,7 +105,8 @@ class b_formatter : public flag_formatter
{
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(months[tm_time.tm_mon], dest);
// fmt_helper::append_string_view(months[tm_time.tm_mon], dest);
fmt_helper::append_string_view(months[tm_time.tm_mon], dest);
}
};
@@ -111,7 +117,7 @@ class B_formatter : public flag_formatter
{
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(full_months[tm_time.tm_mon], dest);
fmt_helper::append_string_view(full_months[tm_time.tm_mon], dest);
}
};
@@ -123,9 +129,9 @@ class c_formatter final : public flag_formatter
// fmt::format_to(dest, "{} {} {} ", days[tm_time.tm_wday],
// months[tm_time.tm_mon], tm_time.tm_mday);
// date
fmt_helper::append_c_str(days[tm_time.tm_wday], dest);
fmt_helper::append_string_view(days[tm_time.tm_wday], dest);
dest.push_back(' ');
fmt_helper::append_c_str(months[tm_time.tm_mon], dest);
fmt_helper::append_string_view(months[tm_time.tm_mon], dest);
dest.push_back(' ');
fmt_helper::append_int(tm_time.tm_mday, dest);
dest.push_back(' ');
@@ -272,7 +278,7 @@ class p_formatter final : public flag_formatter
{
void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
{
fmt_helper::append_c_str(ampm(tm_time), dest);
fmt_helper::append_string_view(ampm(tm_time), dest);
}
};
@@ -287,7 +293,7 @@ class r_formatter final : public flag_formatter
dest.push_back(':');
fmt_helper::pad2(tm_time.tm_sec, dest);
dest.push_back(' ');
fmt_helper::append_c_str(ampm(tm_time), dest);
fmt_helper::append_string_view(ampm(tm_time), dest);
}
};
@@ -401,7 +407,7 @@ class v_formatter final : public flag_formatter
{
void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
{
fmt_helper::append_msg(msg, dest);
fmt_helper::append_string_view(msg, dest);
}
};
@@ -433,7 +439,7 @@ public:
}
void format(const details::log_msg &, const std::tm &, fmt::memory_buffer &dest) override
{
fmt_helper::append_str(str_, dest);
fmt_helper::append_string_view(str_, dest);
}
private:
@@ -511,7 +517,8 @@ class full_formatter final : public flag_formatter
if (!msg.logger_name->empty())
{
dest.push_back('[');
fmt_helper::append_str(*msg.logger_name, dest);
// fmt_helper::append_str(*msg.logger_name, dest);
fmt_helper::append_string_view(*msg.logger_name, dest);
dest.push_back(']');
dest.push_back(' ');
}
@@ -520,11 +527,13 @@ class full_formatter final : public flag_formatter
dest.push_back('[');
// wrap the level name with color
msg.color_range_start = dest.size();
fmt_helper::append_c_str(level::to_c_str(msg.level), dest);
// fmt_helper::append_string_view(level::to_c_str(msg.level), dest);
fmt_helper::append_string_view(level::to_c_str(msg.level), dest);
msg.color_range_end = dest.size();
dest.push_back(']');
dest.push_back(' ');
fmt_helper::append_msg(msg, dest);
// fmt_helper::append_string_view(msg.msg(), dest);
fmt_helper::append_string_view(msg, dest);
}
private:
@@ -571,7 +580,8 @@ public:
f->format(msg, cached_tm_, dest);
}
// write eol
details::fmt_helper::append_c_str(eol_.c_str(), dest);
// details::fmt_helper::append_string_view(eol_.c_str(), dest);
details::fmt_helper::append_string_view(eol_.c_str(), dest);
}
private: