Skip to content

Abort dbus tasks when client disconnects #11

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
marmarek merged 1 commit into from
Aug 26, 2025
Merged

Abort dbus tasks when client disconnects #11

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
10 changes: 7 additions & 3 deletions src/bin/notification-proxy-server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ but this server only supports version {MINOR_VERSION}"
let mut closed_stream = closed_stream.expect("Cannot register for closed signals");
let mut invoked_stream = invoked_stream.expect("Cannot register for invoked signals");
let stdout_ = stdout.clone();
let _handle = tokio::task::spawn_local(async move {
let owner_changed_handle = tokio::task::spawn_local(async move {
while let Some(item) = server_name_owner_changed.next().await {
let item = item
.args()
Expand All @@ -73,7 +73,7 @@ but this server only supports version {MINOR_VERSION}"
}
});
let emitter_ = emitter.clone();
let _handle = tokio::task::spawn_local(async move {
let closed_stream_handle = tokio::task::spawn_local(async move {
while let Some(item) = closed_stream.next().await {
let item = match item.args() {
Ok(item) => item,
Expand All @@ -97,7 +97,7 @@ but this server only supports version {MINOR_VERSION}"
});
let stdout_ = stdout.clone();
let emitter_ = emitter.clone();
let _handle = tokio::task::spawn_local(async move {
let invoked_stream_handle = tokio::task::spawn_local(async move {
while let Some(item) = invoked_stream.next().await {
let item = match item.args() {
Ok(item) => item,
Expand Down Expand Up @@ -167,6 +167,10 @@ but this server only supports version {MINOR_VERSION}"
stdout.transmit(&*data).await
});
}
eprintln!("Leaving loop");
invoked_stream_handle.abort();
closed_stream_handle.abort();
owner_changed_handle.abort();
}

#[tokio::main(flavor = "current_thread")]
Expand Down