Skip to content

Commit 7a9aa78

Browse files
authored
fix error handling in wait_server_ready method (#150) (#159)
1 parent 6456072 commit 7a9aa78

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

catalystwan/session.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from urllib.parse import urljoin, urlparse, urlunparse
1212

1313
from packaging.version import Version # type: ignore
14-
from requests import PreparedRequest, Request, Response, Session, get, head
14+
from requests import PreparedRequest, Request, Response, Session, Timeout, get, head
1515
from requests.exceptions import ConnectionError, HTTPError, RequestException
1616

1717
from catalystwan import USER_AGENT
@@ -394,10 +394,13 @@ def elapsed() -> float:
394394
headers={"User-Agent": USER_AGENT},
395395
)
396396
self.logger.debug(self.response_trace(resp, None))
397-
if resp.status_code != 503:
397+
if resp.ok:
398398
available = True
399-
except ConnectionError as error:
399+
except (ConnectionError, Timeout) as error:
400400
self.logger.debug(self.response_trace(error.response, error.request))
401+
except RequestException as exception:
402+
self.logger.debug(self.response_trace(exception.response, exception.request))
403+
raise ManagerRequestException(*exception.args)
401404
if not available:
402405
sleep(poll_period)
403406
continue

0 commit comments

Comments
 (0)