Skip to content

Fix a hang calling add-peer #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matburt merged 1 commit into from
Dec 11, 2019
Merged

Fix a hang calling add-peer #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions receptor/connection/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ def get_listener(self, listen_url):
def get_peer(self, peer):
service = parse_peer(peer)
if service.scheme == "receptor":
return sock.connect(service.hostname, service.port, self.factory, self.loop)
self.loop.create_task(sock.connect(service.hostname, service.port, self.factory, self.loop))
elif service.scheme in ("ws", "wss"):
return ws.connect(peer, self.factory, self.loop)
self.loop.create_task(ws.connect(peer, self.factory, self.loop))
4 changes: 2 additions & 2 deletions receptor/controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def enable_server(self, listen_urls):
logger.info("Serving on %s", url)
self.loop.create_task(listener)

async def add_peer(self, peer):
def add_peer(self, peer):
logger.info("Connecting to peer {}".format(peer))
await self.loop.create_task(self.connection_manager.get_peer(peer))
self.connection_manager.get_peer(peer)

async def recv(self):
inner = await self.receptor.response_queue.get()
Expand Down
6 changes: 3 additions & 3 deletions receptor/entrypoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async def node_keepalive():
if not config.node_server_disable:
controller.enable_server(config.node_listen)
for peer in config.node_peers:
controller.loop.create_task(controller.add_peer(peer))
controller.add_peer(peer)
if config.node_keepalive_interval > 1:
controller.loop.create_task(node_keepalive())
controller.loop.create_task(controller.receptor.watch_expire())
Expand Down Expand Up @@ -60,7 +60,7 @@ def ping_iter():

async def ping_entrypoint():
read_task = controller.loop.create_task(read_responses())
await controller.add_peer(config.ping_peer)
controller.add_peer(config.ping_peer)
start_wait = time.time()
while not controller.receptor.router.node_is_known(config.ping_recipient) and (time.time() - start_wait < 5):
await asyncio.sleep(0.1)
Expand All @@ -85,7 +85,7 @@ async def send_pings():
def run_as_send(config):
async def send_entrypoint():
read_task = controller.loop.create_task(read_responses())
await controller.add_peer(config.send_peer)
controller.add_peer(config.send_peer)
start_wait = time.time()
while not controller.receptor.router.node_is_known(config.ping_recipient) and (time.time() - start_wait < 5):
await asyncio.sleep(0.1)
Expand Down