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

Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
Daniel Larimer 2014-06-24 21:58:30 -04:00
commit 8008334150
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/log/file_appender.cpp
View file

@ -39,7 +39,8 @@ namespace fc {
void file_appender::log( const log_message& m ) void file_appender::log( const log_message& m )
{ {
std::stringstream line; std::stringstream line;
line << (m.get_context().get_timestamp().time_since_epoch().count() % (1000ll*1000ll*60ll*60))/1000 <<"ms "; //line << (m.get_context().get_timestamp().time_since_epoch().count() % (1000ll*1000ll*60ll*60))/1000 <<"ms ";
line << std::string(m.get_context().get_timestamp()) << " ";
line << std::setw( 10 ) << m.get_context().get_thread_name().substr(0,9).c_str() <<" "; line << std::setw( 10 ) << m.get_context().get_thread_name().substr(0,9).c_str() <<" ";
auto me = m.get_context().get_method(); auto me = m.get_context().get_method();

2
src/log/log_message.cpp
View file

@ -63,7 +63,7 @@ namespace fc
my->file = obj["file"].as_string(); my->file = obj["file"].as_string();
my->line = obj["line"].as_uint64(); my->line = obj["line"].as_uint64();
my->method = obj["method"].as_string(); my->method = obj["method"].as_string();
my->method = obj["hostname"].as_string(); my->hostname = obj["hostname"].as_string();
my->thread_name = obj["thread_name"].as_string(); my->thread_name = obj["thread_name"].as_string();
my->timestamp = obj["timestamp"].as<time_point>(); my->timestamp = obj["timestamp"].as<time_point>();
if( obj.contains( "context" ) ) if( obj.contains( "context" ) )