leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factor out duplicated code for spawning component with tracing span

Browse source
This commit is contained in:
Ian Douglas Scott 2023-03-13 16:05:48 -07:00 • committed by Ashley Wulber
parent 3094e4698e
commit 30ca971eb1
1 changed files with 45 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

147
src/main.rs
View file

@ -72,108 +72,22 @@ async fn main() -> Result<()> {
.expect("failed to start panel"); .expect("failed to start panel");
let span = info_span!(parent: None, "cosmic-app-library"); let span = info_span!(parent: None, "cosmic-app-library");
let stdout_span = span.clone(); start_component("cosmic-app-library", span, &process_manager, &env_vars).await;
let stderr_span = span.clone();
process_manager
.start(
Process::new()
.with_executable("cosmic-app-library")
.with_env(env_vars.clone())
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
async move {
info!("{}", line);
}
.instrument(stdout_span)
})
.with_on_stderr(move |_, _, line| {
let stderr_span = stderr_span.clone();
async move {
warn!("{}", line);
}
.instrument(stderr_span)
}),
)
.await
.expect("failed to start app library");
let span = info_span!(parent: None, "cosmic-launcher"); let span = info_span!(parent: None, "cosmic-launcher");
let stdout_span = span.clone(); start_component("cosmic-launcher", span, &process_manager, &env_vars).await;
let stderr_span = span.clone();
process_manager
.start(
Process::new()
.with_executable("cosmic-launcher")
.with_env(env_vars.clone())
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
async move {
info!("{}", line);
}
.instrument(stdout_span)
})
.with_on_stderr(move |_, _, line| {
let stderr_span = stderr_span.clone();
async move {
warn!("{}", line);
}
.instrument(stderr_span)
}),
)
.await
.expect("failed to start launcher");
let span = info_span!(parent: None, "cosmic-bg"); let span = info_span!(parent: None, "cosmic-bg");
let stdout_span = span.clone(); start_component("cosmic-bg", span, &process_manager, &env_vars).await;
let stderr_span = span.clone();
process_manager
.start(
Process::new()
.with_executable("cosmic-bg")
.with_env(env_vars.clone())
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
async move {
info!("{}", line);
}
.instrument(stdout_span)
})
.with_on_stderr(move |_, _, line| {
let stderr_span = stderr_span.clone();
async move {
warn!("{}", line);
}
.instrument(stderr_span)
}),
)
.await
.expect("failed to start cosmic-bg");
let span = info_span!(parent: None, "xdg-desktop-portal-cosmic"); let span = info_span!(parent: None, "xdg-desktop-portal-cosmic");
let stdout_span = span.clone(); start_component(
let stderr_span = span.clone(); "/usr/libexec/xdg-desktop-portal-cosmic",
process_manager span,
.start( &process_manager,
Process::new() &env_vars,
.with_executable("/usr/libexec/xdg-desktop-portal-cosmic") )
.with_env(env_vars.clone()) .await;
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
async move {
info!("{}", line);
}
.instrument(stdout_span)
})
.with_on_stderr(move |_, _, line| {
let stderr_span = stderr_span.clone();
async move {
warn!("{}", line);
}
.instrument(stderr_span)
}),
)
.await
.expect("Failed to start xdg-desktop-portal-cosmic");
process_manager process_manager
.start(Process::new().with_executable("cosmic-settings-daemon")) .start(Process::new().with_executable("cosmic-settings-daemon"))
@ -183,12 +97,9 @@ async fn main() -> Result<()> {
let (exit_tx, exit_rx) = oneshot::channel(); let (exit_tx, exit_rx) = oneshot::channel();
let _ = ConnectionBuilder::session()? let _ = ConnectionBuilder::session()?
.name("com.system76.CosmicSession")? .name("com.system76.CosmicSession")?
.serve_at( .serve_at("/com/system76/CosmicSession", service::SessionService {
"/com/system76/CosmicSession", exit_tx: Some(exit_tx),
service::SessionService { })?
exit_tx: Some(exit_tx),
},
)?
.build() .build()
.await?; .await?;
@ -217,3 +128,35 @@ async fn main() -> Result<()> {
tokio::time::sleep(std::time::Duration::from_secs(2)).await; tokio::time::sleep(std::time::Duration::from_secs(2)).await;
Ok(()) Ok(())
} }
async fn start_component(
cmd: &str,
span: tracing::Span,
process_manager: &ProcessManager,
env_vars: &[(String, String)],
) {
let stdout_span = span.clone();
let stderr_span = span.clone();
process_manager
.start(
Process::new()
.with_executable(cmd)
.with_env(env_vars.iter().cloned())
.with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone();
async move {
info!("{}", line);
}
.instrument(stdout_span)
})
.with_on_stderr(move |_, _, line| {
let stderr_span = stderr_span.clone();
async move {
warn!("{}", line);
}
.instrument(stderr_span)
}),
)
.await
.expect(&format!("failed to start {}", cmd));
}