Skip to content

Commit f5f7355

Browse files
authored
Handle exceptions in Jira.get_server_info (#785)
1 parent 3f9a8f0 commit f5f7355

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

jbi/services/jira.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,11 @@ def fetch_visible_projects(self) -> list[dict]:
130130

131131
def check_health(self, actions: Actions) -> ServiceHealth:
132132
"""Check health for Jira Service"""
133+
try:
134+
is_up = self.client.get_server_info(True) is not None
135+
except requests.RequestException:
136+
is_up = False
133137

134-
server_info = self.client.get_server_info(True)
135-
is_up = server_info is not None
136138
health: ServiceHealth = {
137139
"up": is_up,
138140
"all_projects_are_visible": is_up and self._all_projects_visible(actions),

tests/unit/services/test_jira.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ def test_jira_retries_failing_connections_in_health_check(
7979
body=ConnectionError(),
8080
)
8181

82-
with pytest.raises(ConnectionError):
83-
jira.get_service().check_health(actions_factory())
84-
82+
healthcheck = jira.get_service().check_health(actions_factory())
83+
assert healthcheck["up"] is False
8584
assert len(mocked_responses.calls) == 4
8685

8786

0 commit comments

Comments
 (0)