Skip to content
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

Connection.poll_all(timeout) should return after timeout #49

Merged
merged 1 commit into from
Sep 3, 2011
Merged

Connection.poll_all(timeout) should return after timeout #49

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
10 changes: 8 additions & 2 deletions rpyc/core/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from rpyc.core import consts, brine, vinegar, netref
from rpyc.core.async import AsyncResult
import socket
import time


class PingError(Exception):
Expand Down Expand Up @@ -394,9 +395,14 @@ def poll_all(self, timeout = 0):
otherwise
"""
at_least_once = False
t_start = time.time()
try:
while self.poll(timeout):
at_least_once = True
while True:
t_remaining = t_start + timeout - time.time()
if t_remaining < 0:
break
if self.poll(t_remaining):
at_least_once = True
except EOFError:
pass
return at_least_once
Expand Down