Remove singleton usage in Core

Tribler · Jun 27, 2016 · 01c75d4 · 01c75d4
1 parent 29cbdaa
commit 01c75d4
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/Tribler/Core/APIImplementation/LaunchManyCore.py b/Tribler/Core/APIImplementation/LaunchManyCore.py
@@ -26,7 +26,6 @@
 from Tribler.Core.Video.VideoPlayer import VideoPlayer
 from Tribler.Core.exceptions import DuplicateDownloadException
 from Tribler.Core.simpledefs import NTFY_DISPERSY, NTFY_STARTED, NTFY_TORRENTS, NTFY_UPDATE, NTFY_TRIBLER
-from Tribler.Policies.BoostingManager import BoostingManager
 from Tribler.community.tunnel.tunnel_community import TunnelSettings
 from Tribler.dispersy.taskmanager import TaskManager
 from Tribler.dispersy.util import blockingCallFromThread, blocking_call_on_reactor_thread
@@ -319,7 +318,8 @@ def load_communities():
  self.watch_folder.start()
 
  if self.session.get_creditmining_enable():
- self.boosting_manager = BoostingManager.get_instance(self.session)
+ from Tribler.Policies.BoostingManager import BoostingManager
+ self.boosting_manager = BoostingManager(self.session)
 
  self.version_check_manager = VersionCheckManager(self.session)
 
@@ -678,6 +678,9 @@ def early_shutdown(self):
 
  # Note: sesslock not held
  self.shutdownstarttime = timemod.time()
+ if self.boosting_manager:
+ yield self.boosting_manager.shutdown()
+ self.boosting_manager = None
  if self.torrent_checker:
  yield self.torrent_checker.shutdown()
  self.torrent_checker = None
@@ -693,10 +696,6 @@ def early_shutdown(self):
  if self.videoplayer:
  yield self.videoplayer.shutdown()
  self.videoplayer = None
- if self.boosting_manager:
- yield self.boosting_manager.shutdown()
- self.boosting_manager.del_instance()
- self.boosting_manager = None
 
  self.version_check_manager.stop()
  self.version_check_manager = None