Skip to content

Don't send method returns replies when caller doesn't want them #22

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

Merged
acrisci merged 1 commit into from
Dec 27, 2019
Merged

Don't send method returns replies when caller doesn't want them #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions dbus_next/message_bus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,22 +540,28 @@ def _process_message(self, msg):
elif msg.message_type == MessageType.METHOD_CALL:
if not handled:
handler = self._find_message_handler(msg)

send_reply = self.send

if msg.flags & MessageFlag.NO_REPLY_EXPECTED:
send_reply = lambda msg: None

if handler:
try:
result = handler(msg)
if type(result) is Message:
self.send(result)
send_reply(result)
except DBusError as e:
self.send(e._as_message(msg))
send_reply(e._as_message(msg))
except Exception as e:
self.send(
send_reply(
Message.new_error(
msg, ErrorType.SERVICE_ERROR,
f'The service interface raised an error: {e}.\n{traceback.format_exc()}'
))

else:
self.send(
send_reply(
Message.new_error(
msg, ErrorType.UNKNOWN_METHOD,
f'{msg.interface}.{msg.member} with signature "{msg.signature}" could not be found'
Expand Down