Merge pull request #10961 from EOSIO/EPE-1835-net_plugin-shutdown-2.0

net_plugin: shutdown segfault fix - 2.0
EOSIO · Dec 15, 2021 · a9f8ce0 · a9f8ce0
2 parents 55e99c2 + 383244f
commit a9f8ce0
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -1351,8 +1351,7 @@ namespace eosio {
    void connection::sync_timeout( boost::system::error_code ec ) {
       if( !ec ) {
          my_impl->sync_master->sync_reassign_fetch( shared_from_this(), benign_other );
-      } else if( ec == boost::asio::error::operation_aborted ) {
-      } else {
+      } else if( ec != boost::asio::error::operation_aborted ) { // don't log on operation_aborted, called on destroy
          fc_elog( logger, "setting timer for sync request got error ${ec}", ("ec", ec.message()) );
       }
    }
@@ -1375,11 +1374,7 @@ namespace eosio {
    void connection::fetch_timeout( boost::system::error_code ec ) {
       if( !ec ) {
          my_impl->dispatcher->retry_fetch( shared_from_this() );
-      } else if( ec == boost::asio::error::operation_aborted ) {
-         if( !connected() ) {
-            fc_dlog( logger, "fetch timeout was cancelled due to dead connection" );
-         }
-      } else {
+      } else if( ec != boost::asio::error::operation_aborted ) { // don't log on operation_aborted, called on destroy
          fc_elog( logger, "setting timer for fetch request got error ${ec}", ("ec", ec.message() ) );
       }
    }