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.

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: clear exception flag on disconnect future if its also sent to handlers #281

Merged
merged 5 commits into from
May 20, 2024
Merged
Changes from 1 commit
Commits
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
11 changes: 11 additions & 0 deletions src/dbus_fast/aio/message_bus.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import array
import asyncio
import contextlib
import logging
import socket
from collections import deque
Expand Down Expand Up @@ -522,13 +523,23 @@ def _finalize(self, err: Optional[Exception] = None) -> None:
except Exception:
logging.warning("could not remove message writer", exc_info=True)

had_handlers = bool(self._method_return_handlers or self._user_message_handlers)

super()._finalize(err)

if self._disconnect_future.done():
return

if err and not self._user_disconnect:
_future_set_exception(self._disconnect_future, err)
# If this happens during a reply the message handlers
bdraco marked this conversation as resolved.
Show resolved Hide resolved
# will have the exception set and wait_for_disconnect will
# never be called so we need to manually set the exception
# as retrieved to avoid asyncio warnings when the future
# is garbage collected.
if had_handlers:
with contextlib.suppress(Exception):
self._disconnect_future.exception()
else:
_future_set_result(self._disconnect_future, None)

Expand Down
Loading