Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix #224 - Improve log messages

Browse source 
- it is not an error to have the next slot be in the future, it happens
every maitenance interval when the skip slots is greater than 0.

- re-order the failure conditions to report configuration issues first,
   then other issues second.
This commit is contained in:
Daniel Larimer 2015-08-18 11:03:44 -04:00
parent d5cc6da54a
commit 80f007faeb
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libraries/plugins/witness/witness.cpp
View file

@ -185,10 +185,30 @@ void witness_plugin::block_production_loop()
{ {
// conditions needed to produce a block: // conditions needed to produce a block:
// we must control the witness scheduled to produce the next block.
if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) {
return false;
}
// we must know the private key corresponding to the witness's
// published block production key.
if( _private_keys.find( scheduled_key ) == _private_keys.end() ) {
elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key));
return false;
}
// the next block must be scheduled after the head block.
// if this check fails, the local clock has not advanced far
// enough from the head block.
if( slot == 0 ) {
ilog("Not producing block because next slot time is in the future (likely a maitenance block).");
return false;
}
// block production must be enabled (i.e. witness must be synced) // block production must be enabled (i.e. witness must be synced)
if( !_production_enabled ) if( !_production_enabled )
{ {
elog("Not producing block because production is disabled."); wlog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)");
return false; return false;
} }
@ -200,19 +220,6 @@ void witness_plugin::block_production_loop()
return false; return false;
} }
// the next block must be scheduled after the head block.
// if this check fails, the local clock has not advanced far
// enough from the head block.
if( slot == 0 ) {
elog("Not producing block because head block time is in the future (is the system clock set correctly?).");
return false;
}
// we must control the witness scheduled to produce the next block.
if( _witnesses.find( scheduled_witness ) == _witnesses.end() ) {
return false;
}
// the local clock must be at least 1 second ahead of head_block_time. // the local clock must be at least 1 second ahead of head_block_time.
if( (now - db.head_block_time()).to_seconds() < GRAPHENE_MIN_BLOCK_INTERVAL ) { if( (now - db.head_block_time()).to_seconds() < GRAPHENE_MIN_BLOCK_INTERVAL ) {
elog("Not producing block because head block is less than a second old."); elog("Not producing block because head block is less than a second old.");
@ -226,12 +233,6 @@ void witness_plugin::block_production_loop()
return false; return false;
} }
// we must know the private key corresponding to the witness's
// published block production key.
if( _private_keys.find( scheduled_key ) == _private_keys.end() ) {
elog("Not producing block because I don't have the private key for ${id}.", ("id", scheduled_key));
return false;
}
return true; return true;
}; };