vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Catch exceptions when ELB times out a connection to etcd.

Browse source
This commit is contained in:
Jake Moshenko 2015-01-23 11:29:38 -05:00
parent 725808a4f8
commit 86852da4ba
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildman/manager/ephemeral.py
View file

@ -8,7 +8,7 @@ import json
from datetime import datetime, timedelta from datetime import datetime, timedelta
from trollius import From, coroutine, Return, async from trollius import From, coroutine, Return, async
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from urllib3.exceptions import ReadTimeoutError from urllib3.exceptions import ReadTimeoutError, ProtocolError
from buildman.manager.basemanager import BaseManager from buildman.manager.basemanager import BaseManager
from buildman.manager.executor import PopenExecutor, EC2Executor from buildman.manager.executor import PopenExecutor, EC2Executor
@ -75,7 +75,7 @@ class EphemeralBuilderManager(BaseManager):
try: try:
etcd_result = changed_key_future.result() etcd_result = changed_key_future.result()
except ReadTimeoutError: except (ReadTimeoutError, ProtocolError):
return return
change_callback(etcd_result) change_callback(etcd_result)