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

Merge pull request #35 from vikramrajkumar/master

Browse source 
Fix log rotation scheduling bug
This commit is contained in:
Nikolai Mushegian 2014-07-05 16:33:09 -04:00
commit 49cbe600f9
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/log/file_appender.cpp
View file

@ -70,6 +70,9 @@ namespace fc {
{ {
if( cfg.rotate ) if( cfg.rotate )
{ {
FC_ASSERT( cfg.rotation_interval >= seconds( 1 ) );
FC_ASSERT( cfg.rotation_limit >= cfg.rotation_interval );
if( cfg.rotation_compression ) if( cfg.rotation_compression )
_compression_thread.reset( new thread( "compression") ); _compression_thread.reset( new thread( "compression") );
@ -100,7 +103,12 @@ namespace fc {
if( !initializing ) if( !initializing )
{ {
if( start_time <= _current_file_start_time ) return; if( start_time <= _current_file_start_time )
{
_rotation_task = schedule( [this]() { rotate_files(); }, _current_file_start_time + cfg.rotation_interval.to_seconds() );
return;
}
fc::scoped_lock<boost::mutex> lock( slock ); fc::scoped_lock<boost::mutex> lock( slock );
out.flush(); out.flush();
out.close(); out.close();
@ -143,7 +151,7 @@ namespace fc {
} }
_current_file_start_time = start_time; _current_file_start_time = start_time;
_rotation_task = schedule( [this]() { rotate_files(); }, now + cfg.rotation_interval ); _rotation_task = schedule( [this]() { rotate_files(); }, _current_file_start_time + cfg.rotation_interval.to_seconds() );
} }
}; };
file_appender::config::config( const fc::path& p ) file_appender::config::config( const fc::path& p )