Fix modules startup order in Session

Tribler · Feb 28, 2020 · c00cfac · c00cfac
1 parent a334c11
commit c00cfac
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/src/tribler-core/tribler_core/session.py b/src/tribler-core/tribler_core/session.py
@@ -420,6 +420,26 @@ async def start(self):
             self.video_server = VideoServer(self.config.get_video_server_port(), self)
             self.video_server.start()
 
+        if self.config.get_libtorrent_enabled():
+            self.readable_status = STATE_START_LIBTORRENT
+            from tribler_core.modules.libtorrent.libtorrent_mgr import LibtorrentMgr
+            self.ltmgr = LibtorrentMgr(self)
+            self.ltmgr.initialize()
+            self.readable_status = STATE_LOAD_CHECKPOINTS
+            await self.ltmgr.load_checkpoints()
+        self.readable_status = STATE_READABLE_STARTED
+
+        if self.config.get_chant_enabled():
+            channels_dir = self.config.get_chant_channels_dir()
+            metadata_db_name = 'metadata.db' if not self.config.get_testnet() else 'metadata_testnet.db'
+            database_path = self.config.get_state_dir() / 'sqlite' / metadata_db_name
+            self.mds = MetadataStore(database_path, channels_dir, self.trustchain_keypair)
+
+        if self.config.get_torrent_checking_enabled():
+            self.readable_status = STATE_START_TORRENT_CHECKER
+            self.torrent_checker = TorrentChecker(self)
+            await self.torrent_checker.initialize()
+
         # IPv8
         if self.config.get_ipv8_enabled():
             from ipv8.configuration import get_default_configuration
@@ -460,12 +480,6 @@ async def start(self):
             except Exception as exc:
                 self._logger.error("bitcoinlib library cannot be loaded: %s", exc)
 
-        if self.config.get_chant_enabled():
-            channels_dir = self.config.get_chant_channels_dir()
-            metadata_db_name = 'metadata.db' if not self.config.get_testnet() else 'metadata_testnet.db'
-            database_path = self.config.get_state_dir() / 'sqlite' / metadata_db_name
-            self.mds = MetadataStore(database_path, channels_dir, self.trustchain_keypair)
-
         if self.config.get_dummy_wallets_enabled():
             # For debugging purposes, we create dummy wallets
             dummy_wallet1 = DummyWallet1()
@@ -474,17 +488,6 @@ async def start(self):
             dummy_wallet2 = DummyWallet2()
             self.wallets[dummy_wallet2.get_identifier()] = dummy_wallet2
 
-        if self.config.get_torrent_checking_enabled():
-            self.readable_status = STATE_START_TORRENT_CHECKER
-            self.torrent_checker = TorrentChecker(self)
-            await self.torrent_checker.initialize()
-
-        if self.config.get_libtorrent_enabled():
-            self.readable_status = STATE_START_LIBTORRENT
-            from tribler_core.modules.libtorrent.libtorrent_mgr import LibtorrentMgr
-            self.ltmgr = LibtorrentMgr(self)
-            self.ltmgr.initialize()
-
         if self.config.get_watch_folder_enabled():
             self.readable_status = STATE_START_WATCH_FOLDER
             self.watch_folder = WatchFolder(self)
@@ -501,11 +504,6 @@ async def start(self):
         if self.config.get_ipv8_enabled() and self.config.get_trustchain_enabled():
             self.payout_manager = PayoutManager(self.trustchain_community, self.dht_community)
 
-        if self.config.get_libtorrent_enabled():
-            self.readable_status = STATE_LOAD_CHECKPOINTS
-            await self.ltmgr.load_checkpoints()
-        self.readable_status = STATE_READABLE_STARTED
-
         if self.config.get_credit_mining_enabled():
             self.readable_status = STATE_START_CREDIT_MINING
             from tribler_core.modules.credit_mining.credit_mining_manager import CreditMiningManager