improve sgx related logs; #841

skalenetwork · Feb 5, 2025 · 6bedb01 · 6bedb01
1 parent 180fe72
commit 6bedb01
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git 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/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
@@ -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" ) );