Merge remote-tracking branch 'upstream/master' into sql_plugin

asiniscalchi · asiniscalchi · commit fe7bea83a293 · 2018-07-18T10:47:40.000+02:00
diff --git a/db/actions_table.cpp b/db/actions_table.cpp
@@ -88,9 +88,10 @@ void actions_table::add(chain::action action, chain::transaction_id_type transac
         return; // no ABI no party. Should we still store it?
     }
 
-    abis.set_abi(abi);
+    static const fc::microseconds abi_serializer_max_time;
+    abis.set_abi(abi, abi_serializer_max_time);
 
-    auto abi_data = abis.binary_to_variant(abis.get_action_type(action.name), action.data);
+    auto abi_data = abis.binary_to_variant(abis.get_action_type(action.name), action.data, abi_serializer_max_time);
     string json = fc::json::to_string(abi_data);
 
     boost::uuids::random_generator gen;
diff --git a/sql_db_plugin.cpp b/sql_db_plugin.cpp
@@ -40,37 +40,42 @@ void sql_db_plugin::set_program_options(options_description& cli, options_descri
 void sql_db_plugin::plugin_initialize(const variables_map& options)
 {
     ilog("initialize");
+    try {
+        std::string uri_str = options.at(SQL_DB_URI_OPTION).as<std::string>();
+        if (uri_str.empty())
+        {
+            wlog("db URI not specified => eosio::sql_db_plugin disabled.");
+            return;
+        }
+        ilog("connecting to ${u}", ("u", uri_str));
+        uint32_t block_num_start = options.at(BLOCK_START_OPTION).as<uint32_t>();
+        auto db = std::make_unique<database>(uri_str, block_num_start);
 
-    std::string uri_str = options.at(SQL_DB_URI_OPTION).as<std::string>();
-    if (uri_str.empty())
-    {
-        wlog("db URI not specified => eosio::sql_db_plugin disabled.");
-        return;
-    }
-    ilog("connecting to ${u}", ("u", uri_str));
-    uint32_t block_num_start = options.at(BLOCK_START_OPTION).as<uint32_t>();
-    auto db = std::make_unique<database>(uri_str, block_num_start);
-
-    if (options.at(HARD_REPLAY_OPTION).as<bool>() ||
-         options.at(REPLAY_OPTION).as<bool>() ||
-         options.at(RESYNC_OPTION).as<bool>() ||
-        !db->is_started())
-    {
-        if (block_num_start == 0) {
-            ilog("Resync requested: wiping database");
-            db->wipe();
+        if (options.at(HARD_REPLAY_OPTION).as<bool>() ||
+                options.at(REPLAY_OPTION).as<bool>() ||
+                options.at(RESYNC_OPTION).as<bool>() ||
+                !db->is_started())
+        {
+            if (block_num_start == 0) {
+                ilog("Resync requested: wiping database");
+                if( options.at( RESYNC_OPTION ).as<bool>() ||
+                        options.at( REPLAY_OPTION ).as<bool>()) {
+                    ilog( "Resync requested: wiping database" );
+                    db->wipe();
+                }
+            }
         }
-    }
 
-    m_block_consumer = std::make_unique<consumer<chain::block_state_ptr>>(std::move(db));
-    m_irreversible_block_consumer = std::make_unique<consumer<chain::block_state_ptr>>(std::move(db));
+        m_block_consumer = std::make_unique<consumer<chain::block_state_ptr>>(std::move(db));
+        m_irreversible_block_consumer = std::make_unique<consumer<chain::block_state_ptr>>(std::move(db));
 
-    chain_plugin* chain_plug = app().find_plugin<chain_plugin>();
-    FC_ASSERT(chain_plug);
-    auto& chain = chain_plug->chain();
-    // TODO: irreversible to different queue to just find block & update flag
-    //m_irreversible_block_connection.emplace(chain.irreversible_block.connect([=](const chain::block_state_ptr& b) {m_irreversible_block_consumer->push(b);}));
-    m_block_connection.emplace(chain.accepted_block.connect([=](const chain::block_state_ptr& b) {m_block_consumer->push(b);}));
+        chain_plugin* chain_plug = app().find_plugin<chain_plugin>();
+        FC_ASSERT(chain_plug);
+        auto& chain = chain_plug->chain();
+        // TODO: irreversible to different queue to just find block & update flag
+        //m_irreversible_block_connection.emplace(chain.irreversible_block.connect([=](const chain::block_state_ptr& b) {m_irreversible_block_consumer->push(b);}));
+        m_block_connection.emplace(chain.accepted_block.connect([=](const chain::block_state_ptr& b) {m_block_consumer->push(b);}));
+    } FC_LOG_AND_RETHROW()
 }
 
 void sql_db_plugin::plugin_startup()
