diff --git a/lbrynet/analytics/manager.py b/lbrynet/analytics/manager.py index 632733dbf..5af578b61 100644 --- a/lbrynet/analytics/manager.py +++ b/lbrynet/analytics/manager.py @@ -1,3 +1,5 @@ +import base58 + from lbrynet.core import looping_call_manager from twisted.internet import defer @@ -26,8 +28,9 @@ class Manager(object): api = Api.new_instance() if events is None: events = Events( - make_context(get_platform(), settings.wallet), - 'not loaded', 'not loaded' + make_context(get_platform(), conf.settings.wallet), + base58.b58encode(conf.settings.lbryid), + conf.settings.session_id, ) return cls(api, events, Track()) diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index bcc6a4d52..0bbf63b4e 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -376,10 +376,6 @@ class Daemon(AuthJSONRPCServer): self.lbryid = utils.generate_id() lbryid_file.write(base58.b58encode(self.lbryid)) - def _set_events(self): - context = analytics.make_context(self._get_platform(), self.wallet_type) - self._events = analytics.Events(context, base58.b58encode(self.lbryid), self._session_id) - def _check_network_connection(self): self.connected_to_internet = utils.check_connection() @@ -694,16 +690,6 @@ class Daemon(AuthJSONRPCServer): return d def _get_analytics(self): - context = analytics.make_context(self._get_platform(), self.wallet_type) - events_generator = analytics.Events( - context, base58.b58encode(self.lbryid), self._session_id) - if self.analytics_manager is None: - self.analytics_manager = analytics.Manager.new_instance( - events=events_generator - ) - else: - self.analytics_manager.update_events_generator(events_generator) - if not self.analytics_manager.is_started: self.analytics_manager.start() self.analytics_manager.register_repeating_metric(