Skip to content

fix: hear the session's requests while waiting for the compositor #240

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

Open
LinuxBoy-96 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: hear the session's requests while waiting for the compositor #240

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
17 changes: 14 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,20 @@ async fn start(
)
.wrap_err("failed to start compositor")?;

let mut env_vars = env_rx
.await
.expect("failed to receive environmental variables")
let env_vars = tokio::select! {
vars = env_rx => vars,
request = session_rx.recv() => {
compositor_handle.abort();
token.cancel();
tokio::time::sleep(Duration::from_secs(2)).await;
return Ok(match request {
Some(SessionRequest::Restart) => Status::Restarted,
_ => Status::Exited,
});
}
};
let mut env_vars = env_vars
.wrap_err("failed to receive environmental variables")?
.into_iter()
.collect::<Vec<_>>();
info!(
Expand Down