syndicate-lang
/
syndicate-rs
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Signal running only once spawn has started

This commit is contained in:
Tony Garnock-Jones 2021-09-20 23:32:31 +02:00
parent 9f316ac659
commit a92647b740
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
syndicate-server/src/services/daemon.rs
View File

@ -62,17 +62,17 @@ fn run(
_root_ds: Arc<Cap>,
service: DaemonService,
) -> ActorResult {
{
let spec = language().unparse(&service);
config_ds.assert(t, &(), &syndicate_macros::template!("<service-running =spec>"));
}
let spec = language().unparse(&service);
Ok(during!(t, config_ds, language(), <daemon #(service.id.0) $config>, |t: &mut Activation| {
match language().parse::<DaemonSpec>(&config) {
Ok(during!(t, config_ds, language(), <daemon #(service.id.0) $config>, {
let spec = spec.clone();
let config_ds = Arc::clone(&config_ds);
|t: &mut Activation| match language().parse::<DaemonSpec>(&config) {
Ok(config) => {
tracing::info!(?config);
let config = config.elaborate();
let facet = t.facet.clone();
t.linked_task(syndicate::name!("subprocess"), async move {
tracing::info!(?config);
let argv = config.argv.elaborate();
let mut cmd = process::Command::new(argv.program);
cmd.args(argv.args);
@ -131,16 +131,24 @@ fn run(
tracing::info!(?cmd);
let mut child = cmd.spawn()?;
facet.activate(
Account::new(syndicate::name!("announce-service-running")),
|t| {
config_ds.assert(t, &(), &syndicate_macros::template!("<service-running =spec>"));
Ok(())
})?;
tracing::info!(status = ?child.wait().await);
Ok(())
});
Ok(())
}
Err(_) => {
tracing::error!(?config, "Invalid DaemonSpec");
return cannot_start();
}
}
Ok(())
}))
}