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

🐛 Fix healthcheck in api-server #6662

Merged
merged 7 commits into from
Nov 15, 2024
Merged

🐛 Fix healthcheck in api-server #6662

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
510df85
fix healthcheck
bisgaard-itis Nov 4, 2024
f62693a
cleanup
bisgaard-itis Nov 4, 2024
2a66955
@pcrespov add comment to changed line
bisgaard-itis Nov 8, 2024
bad9eda
merge master into bugfix-healthcheck-rabbitmq-cancelled-connection
bisgaard-itis Nov 8, 2024
b537757
merge master into bugfix-healthcheck-rabbitmq-cancelled-connection
bisgaard-itis Nov 14, 2024
7766dba
merge master into bugfix-healthcheck-rabbitmq-cancelled-connection
bisgaard-itis Nov 14, 2024
d1e7141
merge master into bugfix-healthcheck-rabbit-cancelled-connection
bisgaard-itis Nov 15, 2024
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
7 changes: 3 additions & 4 deletions services/api-server/src/simcore_service_api_server/core/health_checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ async def teardown(self):

@property
def healthy(self) -> bool:
return self._health_check_failure_count <= self._allowed_health_check_failures
return self._rabbit_client.healthy and (
bisgaard-itis marked this conversation as resolved.
Show resolved Hide resolved
self._health_check_failure_count <= self._allowed_health_check_failures
) # https://github.com/ITISFoundation/osparc-simcore/pull/6662

@property
def health_check_failure_count(self) -> NonNegativeInt:
Expand All @@ -82,9 +84,6 @@ async def _background_task_method(self):
while self._dummy_queue.qsize() > 0:
_ = self._dummy_queue.get_nowait()
try:
if not self._rabbit_client.healthy:
self._increment_health_check_failure_count()
return
await asyncio.wait_for(
self._rabbit_client.publish(
self._dummy_message.channel_name, self._dummy_message
Expand Down
Loading