Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

use utils.call_later in ConnectionManager

Browse source
This commit is contained in:
Kay Kurokawa 2017-02-16 16:25:57 -05:00
parent 30c7559d3a
commit c27fe7af31
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lbrynet/core/client/ConnectionManager.py
View file

@ -5,7 +5,7 @@ from lbrynet import interfaces
from lbrynet import conf from lbrynet import conf
from lbrynet.core.client.ClientProtocol import ClientProtocolFactory from lbrynet.core.client.ClientProtocol import ClientProtocolFactory
from lbrynet.core.Error import InsufficientFundsError from lbrynet.core.Error import InsufficientFundsError
from lbrynet.core import utils
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -19,7 +19,6 @@ class PeerConnectionHandler(object):
class ConnectionManager(object): class ConnectionManager(object):
implements(interfaces.IConnectionManager) implements(interfaces.IConnectionManager)
callLater = reactor.callLater
MANAGE_CALL_INTERVAL_SEC = 1 MANAGE_CALL_INTERVAL_SEC = 1
def __init__(self, downloader, rate_limiter, def __init__(self, downloader, rate_limiter,
@ -54,7 +53,7 @@ class ConnectionManager(object):
def start(self): def start(self):
log.debug("%s starting", self._get_log_name()) log.debug("%s starting", self._get_log_name())
self._start() self._start()
self._next_manage_call = self.callLater(0, self.manage) self._next_manage_call = utils.call_later(0, self.manage)
return defer.succeed(True) return defer.succeed(True)
@ -156,7 +155,7 @@ class ConnectionManager(object):
self._manage_deferred.callback(None) self._manage_deferred.callback(None)
self._manage_deferred = None self._manage_deferred = None
if not self.stopped and schedule_next_call: if not self.stopped and schedule_next_call:
self._next_manage_call = self.callLater(self.MANAGE_CALL_INTERVAL_SEC, self.manage) self._next_manage_call = utils.call_later(self.MANAGE_CALL_INTERVAL_SEC, self.manage)
def _rank_request_creator_connections(self): def _rank_request_creator_connections(self):
"""Returns an ordered list of our request creators, ranked according """Returns an ordered list of our request creators, ranked according

8
tests/unit/core/client/test_ConnectionManager.py
View file

@ -3,7 +3,7 @@ import time
import logging import logging
from lbrynet.core import log_support from lbrynet.core import log_support
from lbrynet.core.client.ConnectionManager import ConnectionManager #from lbrynet.core.client.ConnectionManager import ConnectionManager
from lbrynet.core.client.ClientRequest import ClientRequest from lbrynet.core.client.ClientRequest import ClientRequest
from lbrynet.core.server.ServerProtocol import ServerProtocol from lbrynet.core.server.ServerProtocol import ServerProtocol
from lbrynet.core.RateLimiter import RateLimiter from lbrynet.core.RateLimiter import RateLimiter
@ -16,6 +16,7 @@ from twisted.internet import defer, reactor, task
from twisted.internet.task import deferLater from twisted.internet.task import deferLater
from twisted.internet.protocol import Protocol, ServerFactory from twisted.internet.protocol import Protocol, ServerFactory
from lbrynet import conf from lbrynet import conf
from lbrynet.core import utils
from lbrynet.interfaces import IQueryHandlerFactory, IQueryHandler, IRequestCreator from lbrynet.interfaces import IQueryHandlerFactory, IQueryHandler, IRequestCreator
from zope.interface import implements from zope.interface import implements
@ -122,11 +123,12 @@ class TestIntegrationConnectionManager(unittest.TestCase):
self.downloader = MocDownloader() self.downloader = MocDownloader()
self.rate_limiter = RateLimiter() self.rate_limiter = RateLimiter()
self.primary_request_creator = MocRequestCreator([self.TEST_PEER]) self.primary_request_creator = MocRequestCreator([self.TEST_PEER])
self.clock = task.Clock()
utils.call_later = self.clock.callLater
from lbrynet.core.client.ConnectionManager import ConnectionManager
self.connection_manager = ConnectionManager(self.downloader, self.rate_limiter, self.connection_manager = ConnectionManager(self.downloader, self.rate_limiter,
[self.primary_request_creator], []) [self.primary_request_creator], [])
self.clock = task.Clock()
self.connection_manager.callLater = self.clock.callLater
self.connection_manager._start() self.connection_manager._start()
self.server_port = None self.server_port = None