diff --git a/src/log/console_appender.cpp b/src/log/console_appender.cpp index 31341f3..c3c68f7 100644 --- a/src/log/console_appender.cpp +++ b/src/log/console_appender.cpp @@ -12,6 +12,9 @@ #include "console_defines.h" #include #include +#include +#include + namespace fc { console_appender::console_appender( const variant& args ) @@ -58,19 +61,46 @@ namespace fc { return get_console_color( lc[l] ); } void console_appender::log( const log_message& m ) { - fc::string message = fc::format_string( m.get_format(), m.get_data() ); - fc::variant lmsg(m); + //fc::string message = fc::format_string( m.get_format(), m.get_data() ); + //fc::variant lmsg(m); FILE* out = stream::std_error ? stderr : stdout; - fc::string fmt_str = fc::format_string( cfg.format, mutable_variant_object(m.get_context())( "message", message) ); + //fc::string fmt_str = fc::format_string( cfg.format, mutable_variant_object(m.get_context())( "message", message) ); + std::stringstream file_line; + file_line << m.get_context().get_file() <<":"< lock(log_mutex()); #ifndef WIN32 if(isatty(fileno(out))) fprintf( out, "\r%s", get_color( m.get_context().get_log_level() ) ); #endif - fprintf( out, "%s", fmt_str.c_str() ); + fprintf( out, "%s", line.str().c_str()); //fmt_str.c_str() ); #ifndef WIN32 if(isatty(fileno(out))) fprintf( out, "\r%s", CONSOLE_DEFAULT );