moved to log_msg

This commit is contained in:
gabime
2014-03-28 16:05:09 +03:00
parent 0b2bd0fc73
commit f909caf38b
11 changed files with 118 additions and 87 deletions

View File

@@ -10,18 +10,17 @@
#include "common_types.h"
#include "details/os.h"
#include "details/fast_oss.h"
#include "details/stack_oss.h"
namespace c11log
{
namespace formatters
{
class formatter
{
public:
virtual void format_header(const std::string& logger_name, level::level_enum level, const log_clock::time_point& tp, std::ostream& dest) = 0;
public:
virtual void format_header(const std::string& logger_name, level::level_enum level, const log_clock::time_point& tp, std::ostream& output) = 0;
};
@@ -29,17 +28,17 @@ class default_formatter: public formatter
{
public:
// Format: [2013-12-29 01:04:42.900] [logger_name:Info] Message body
void format_header(const std::string& logger_name, level::level_enum level, const log_clock::time_point& tp, std::ostream& dest) override
void format_header(const std::string& logger_name, level::level_enum level, const log_clock::time_point& tp, std::ostream& output) override
{
_format_time(tp, dest);
_format_time(tp, output);
if(!logger_name.empty())
dest << " [" << logger_name << ':' << c11log::level::to_str(level) << "] ";
output << " [" << logger_name << ':' << c11log::level::to_str(level) << "] ";
else
dest << " [" << c11log::level::to_str(level) << "] ";
output << " [" << c11log::level::to_str(level) << "] ";
}
private:
void _format_time(const log_clock::time_point& tp, std::ostream &dest);
void _format_time(const log_clock::time_point& tp, std::ostream &output);
};
@@ -48,7 +47,7 @@ private:
} //namespace c11log
// Format datetime like this: [2014-03-14 17:15:22]
inline void c11log::formatters::default_formatter::_format_time(const log_clock::time_point& tp, std::ostream &dest)
inline void c11log::formatters::default_formatter::_format_time(const log_clock::time_point& tp, std::ostream &output)
{
using namespace c11log::details::os;
using namespace std::chrono;
@@ -68,7 +67,7 @@ inline void c11log::formatters::default_formatter::_format_time(const log_clock:
if(tp_time_t != s_cache_time_t)
{
auto tm_now = details::os::localtime(tp_time_t);
details::fast_oss time_oss;
details::stack_oss time_oss;
time_oss.fill('0');
time_oss << '[' << tm_now.tm_year + 1900 << '-';
time_oss.width(2);
@@ -88,5 +87,5 @@ inline void c11log::formatters::default_formatter::_format_time(const log_clock:
std::memcpy(s_cache_str, buf.first, buf.second);
s_cache_size = buf.second;
}
dest.write(s_cache_str, s_cache_size);
output.write(s_cache_str, s_cache_size);
}