diff --git a/catchup/client/CatchupClientAgent.cpp b/catchup/client/CatchupClientAgent.cpp index 767eb076c..26774d323 100644 --- a/catchup/client/CatchupClientAgent.cpp +++ b/catchup/client/CatchupClientAgent.cpp @@ -269,10 +269,15 @@ ptr< CommittedBlockList > CatchupClientAgent::readMissingBlocks( ptr< ClientSock if ( blockSizes->size() > 1 ) { - LOG( info, "CATCHUP_GOT_BLOCKS:COUNT:" + if ( blockList->getBlocks()->size() > 1) { + LOG( info, "CATCHUP_GOT_BLOCKS:COUNT:" << to_string( blockSizes->size() ) << ":STARTBLOCK:" << string( blockList->getBlocks()->at( 0 )->getBlockID() ) << ":FROM_NODE:" << _socket->getIP() ); + } + else { + LOG( err, "Could not deserialize blocks" ); + } } } catch ( ExitRequestedException& ) { throw; diff --git a/db/CacheLevelDB.cpp b/db/CacheLevelDB.cpp index eb56573ea..8942d3bf5 100644 --- a/db/CacheLevelDB.cpp +++ b/db/CacheLevelDB.cpp @@ -397,7 +397,10 @@ CacheLevelDB::CacheLevelDB( Schain* _sChain, string& _dirName, string& _prefix, verify(); } -CacheLevelDB::~CacheLevelDB() {} +CacheLevelDB::~CacheLevelDB() { + if (options.block_cache) + delete options.block_cache; +} using namespace boost::filesystem; diff --git a/json/JSONFactory.cpp b/json/JSONFactory.cpp index cf42f79ea..5d585bfd5 100644 --- a/json/JSONFactory.cpp +++ b/json/JSONFactory.cpp @@ -570,7 +570,7 @@ void JSONFactory::checkSGXStatus( Json::Value& _result ) { if ( status != 0 ) { LOG( err, "SGX server returned error status:" << to_string( status ) ); - LOG( err, _result.asString() ); + LOG( err, _result["errorMessage"].asString() ); } CHECK_STATE( status == 0 ); diff --git a/sgxclient/SgxZmqMessage.cpp b/sgxclient/SgxZmqMessage.cpp index 3ed709221..80f1fa0eb 100644 --- a/sgxclient/SgxZmqMessage.cpp +++ b/sgxclient/SgxZmqMessage.cpp @@ -80,6 +80,11 @@ shared_ptr< SgxZmqMessage > SgxZmqMessage::parse( CHECK_STATE( ( *d )["status"].IsNumber() ) uint64_t status = ( *d )["status"].GetInt64(); + + if ( status != 0 ) { + LOG( err, ( *d )["errorMessage"].GetString() ); + } + CHECK_STATE( status == 0 ); CHECK_STATE( d->HasMember( "type" ) ); diff --git a/test/twonodeBLS/node1/Node.json b/test/twonodeBLS/node1/Node.json index 4f7a14a5e..5e0145d42 100644 --- a/test/twonodeBLS/node1/Node.json +++ b/test/twonodeBLS/node1/Node.json @@ -4,7 +4,6 @@ "bindIP": "127.0.0.1", "basePort":1231, "logLevel": "info", - "logLevelProposal": "info", "simulateNetworkWriteDelayMs": 100, "insecureTestBLSPrivateKey":"4160780231445160889237664391382223604184857153814275770598791864649971919844", diff --git a/test/twonodes/node1/Node.json b/test/twonodes/node1/Node.json index f839a0c5f..0e66f5586 100644 --- a/test/twonodes/node1/Node.json +++ b/test/twonodes/node1/Node.json @@ -4,7 +4,6 @@ "bindIP": "127.0.0.1", "basePort":1231, "logLevel": "info", - "logLevelProposal": "info", "simulateNetworkWriteDelayMs": 100 } diff --git a/test/twonodes_sameip/node1/Node.json b/test/twonodes_sameip/node1/Node.json index f839a0c5f..0e66f5586 100644 --- a/test/twonodes_sameip/node1/Node.json +++ b/test/twonodes_sameip/node1/Node.json @@ -4,7 +4,6 @@ "bindIP": "127.0.0.1", "basePort":1231, "logLevel": "info", - "logLevelProposal": "info", "simulateNetworkWriteDelayMs": 100 }