Merge pull request #3587 from steemit/shutdown-timeout

Cleanup steemd shutdown
steemit · Feb 5, 2020 · 3bda18b · 3bda18b
2 parents 2c79b24 + aed7a0b
commit 3bda18b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libraries/plugins/apis/condenser_api/condenser_api.cpp b/libraries/plugins/apis/condenser_api/condenser_api.cpp
@@ -1745,7 +1745,12 @@ namespace detail
             std::current_exception() );
       }
 
-      return p.get_future().get();
+      auto future = p.get_future();
+      auto status = future.wait_for( boost::chrono::minutes( 1 ) );
+
+      FC_ASSERT( status == boost::future_status::ready, "A timeout has occurred during broadcast_transaction_synchronous" );
+
+      return future.get();
    }
 
    DEFINE_API_IMPL( condenser_api_impl, broadcast_block )

diff --git a/libraries/plugins/webserver/include/steem/plugins/webserver/webserver_plugin.hpp b/libraries/plugins/webserver/include/steem/plugins/webserver/webserver_plugin.hpp
@@ -3,6 +3,7 @@
 #include <appbase/application.hpp>
 
 #include <steem/plugins/json_rpc/json_rpc_plugin.hpp>
+#include <steem/plugins/chain/chain_plugin.hpp>
 
 #include <boost/thread.hpp>
 #include <boost/container/vector.hpp>
@@ -34,7 +35,7 @@ class webserver_plugin : public appbase::plugin< webserver_plugin >
       webserver_plugin();
       virtual ~webserver_plugin();
 
-      APPBASE_PLUGIN_REQUIRES( (plugins::json_rpc::json_rpc_plugin) );
+      APPBASE_PLUGIN_REQUIRES( (plugins::chain::chain_plugin)(plugins::json_rpc::json_rpc_plugin) );
 
       static const std::string& name() { static std::string name = STEEM_WEBSERVER_PLUGIN_NAME; return name; }