Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Colorize fc log messages on win32

Browse source
This commit is contained in:
Eric Frias 2014-04-06 18:06:43 -04:00
parent 3d02e3bc00
commit 8bdc6fd219
2 changed files with 49 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/fc/log/console_appender.hpp
View file

@ -48,12 +48,12 @@ namespace fc
console_appender( const variant& args ); console_appender( const variant& args );
const char* get_color( log_level l )const; ~console_appender();
virtual void log( const log_message& m ); virtual void log( const log_message& m );
private: private:
config cfg; class impl;
color::type lc[log_level::off+1]; std::unique_ptr<impl> my;
}; };
} // namespace fc } // namespace fc

64
src/log/console_appender.cpp
View file

@ -17,15 +17,37 @@
namespace fc { namespace fc {
console_appender::console_appender( const variant& args )
class console_appender::impl {
public:
config cfg;
color::type lc[log_level::off+1];
#ifdef WIN32
HANDLE console_handle;
#endif
};
console_appender::console_appender( const variant& args ) :
my(new impl)
{ {
#ifdef WIN32
my->console_handle = INVALID_HANDLE_VALUE;
#endif
try try
{ {
cfg = args.as<config>();//fc::variant_cast<config>(args); my->cfg = args.as<config>();//fc::variant_cast<config>(args);
#ifdef WIN32
if (my->cfg.stream = stream::std_error)
my->console_handle = GetStdHandle(STD_ERROR_HANDLE);
else if (my->cfg.stream = stream::std_out)
my->console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
#endif
for( int i = 0; i < log_level::off+1; ++i ) for( int i = 0; i < log_level::off+1; ++i )
lc[i] = color::console_default; my->lc[i] = color::console_default;
for( auto itr = cfg.level_colors.begin(); itr != cfg.level_colors.end(); ++itr ) for( auto itr = my->cfg.level_colors.begin(); itr != my->cfg.level_colors.end(); ++itr )
lc[itr->level] = itr->color; my->lc[itr->level] = itr->color;
} }
catch ( exception& e ) catch ( exception& e )
{ {
@ -34,8 +56,14 @@ namespace fc {
} }
} }
const char* get_console_color(console_appender::color::type t ) { console_appender::~console_appender() {}
#ifndef _MSC_VER
#ifdef WIN32
static WORD
#else
static const char*
#endif
get_console_color(console_appender::color::type t ) {
switch( t ) { switch( t ) {
case console_appender::color::red: return CONSOLE_RED; case console_appender::color::red: return CONSOLE_RED;
case console_appender::color::green: return CONSOLE_GREEN; case console_appender::color::green: return CONSOLE_GREEN;
@ -48,18 +76,12 @@ namespace fc {
default: default:
return CONSOLE_DEFAULT; return CONSOLE_DEFAULT;
} }
#else
return "";
#endif
} }
boost::mutex& log_mutex() { boost::mutex& log_mutex() {
static boost::mutex m; return m; static boost::mutex m; return m;
} }
const char* console_appender::get_color( log_level l )const {
return get_console_color( lc[l] );
}
void console_appender::log( const log_message& m ) { void console_appender::log( const log_message& m ) {
//fc::string message = fc::format_string( m.get_format(), m.get_data() ); //fc::string message = fc::format_string( m.get_format(), m.get_data() );
//fc::variant lmsg(m); //fc::variant lmsg(m);
@ -96,17 +118,23 @@ namespace fc {
fc::unique_lock<boost::mutex> lock(log_mutex()); fc::unique_lock<boost::mutex> lock(log_mutex());
#ifndef WIN32 #ifdef WIN32
if(isatty(fileno(out))) fprintf( out, "\r%s", get_color( m.get_context().get_log_level() ) ); if (my->console_handle != INVALID_HANDLE_VALUE)
SetConsoleTextAttribute(my->console_handle, get_console_color( my->lc[m.get_context().get_log_level()] ));
#else
if(isatty(fileno(out))) fprintf( out, "\r%s", get_console_color( my->lc[m.get_context().get_log_level()] ) );
#endif #endif
fprintf( out, "%s", line.str().c_str()); //fmt_str.c_str() ); fprintf( out, "%s", line.str().c_str()); //fmt_str.c_str() );
#ifndef WIN32 #ifdef WIN32
if (my->console_handle != INVALID_HANDLE_VALUE)
SetConsoleTextAttribute(my->console_handle, CONSOLE_DEFAULT);
#else
if(isatty(fileno(out))) fprintf( out, "\r%s", CONSOLE_DEFAULT ); if(isatty(fileno(out))) fprintf( out, "\r%s", CONSOLE_DEFAULT );
#endif #endif
fprintf( out, "\n" ); fprintf( out, "\n" );
if( cfg.flush ) fflush( out ); if( my->cfg.flush ) fflush( out );
} }
} }