summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 16:19:54 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 16:19:54 +0000
commitb604bc9fb64e5ae83076add7fb6f61b29211b857 (patch)
treee911a2ad4c604b216ce6066c061c9aac5330a9af
parent1f8889595bb506559bfe6157e4d536e11c8239fb (diff)
parent0558e173e9d3b27fb7dc363e306eaf5109511729 (diff)
downloadgear-b604bc9fb64e5ae83076add7fb6f61b29211b857.tar.gz
Merge "Handle SIGINT correctly in Client.waitForServer()"
-rw-r--r--gear/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gear/__init__.py b/gear/__init__.py
index 86fb675..fa6b872 100644
--- a/gear/__init__.py
+++ b/gear/__init__.py
@@ -1209,7 +1209,7 @@ class BaseClient(BaseClientServer):
self.connections_condition.acquire()
while self.running and not self.active_connections:
self.log.debug("Waiting for at least one active connection")
- self.connections_condition.wait()
+ self.connections_condition.wait(timeout=1)
if self.active_connections:
self.log.debug("Active connection found")
connected = True