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

Treat parent-link, if present, as non-daemon too

This commit is contained in:
Tony Garnock-Jones 2021-08-25 17:38:41 +02:00
parent bc5e4fa736
commit 2fbde4a7f2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
syndicate-server/src/main.rs
View File

@ -82,7 +82,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
tracing::info!(r""); tracing::info!(r"");
} }
let mut daemons = Vec::new(); let mut non_daemons = Vec::new();
tracing::trace!("startup"); tracing::trace!("startup");
@ -94,11 +94,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
if config.inferior { if config.inferior {
let ds = Arc::clone(&ds); let ds = Arc::clone(&ds);
Actor::new().boot(syndicate::name!("parent"), non_daemons.push(
|t| run_io_relay(t, Actor::new().boot(syndicate::name!("parent"), move |t| run_io_relay(
relay::Input::Bytes(Box::pin(tokio::io::stdin())), t,
relay::Output::Bytes(Box::pin(tokio::io::stdout())), relay::Input::Bytes(Box::pin(tokio::io::stdin())),
ds)); relay::Output::Bytes(Box::pin(tokio::io::stdout())),
ds)));
} }
let gateway = Cap::guard(&Actor::create_and_start( let gateway = Cap::guard(&Actor::create_and_start(
@ -119,7 +120,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
for port in config.ports.clone() { for port in config.ports.clone() {
let gateway = Arc::clone(&gateway); let gateway = Arc::clone(&gateway);
daemons.push(Actor::new().boot( non_daemons.push(Actor::new().boot(
syndicate::name!("tcp", port), syndicate::name!("tcp", port),
move |t| Ok(t.state.linked_task(syndicate::name!("listener"), move |t| Ok(t.state.linked_task(syndicate::name!("listener"),
run_tcp_listener(gateway, port))))); run_tcp_listener(gateway, port)))));
@ -127,13 +128,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
for path in config.sockets.clone() { for path in config.sockets.clone() {
let gateway = Arc::clone(&gateway); let gateway = Arc::clone(&gateway);
daemons.push(Actor::new().boot( non_daemons.push(Actor::new().boot(
syndicate::name!("unix", socket = debug(path.to_str().expect("representable UnixListener path"))), syndicate::name!("unix", socket = debug(path.to_str().expect("representable UnixListener path"))),
move |t| Ok(t.state.linked_task(syndicate::name!("listener"), move |t| Ok(t.state.linked_task(syndicate::name!("listener"),
run_unix_listener(gateway, path))))); run_unix_listener(gateway, path)))));
} }
futures::future::join_all(daemons).await; futures::future::join_all(non_daemons).await;
Ok(()) Ok(())
} }