Update for new syndicate crate

This commit is contained in:
Tony Garnock-Jones 2023-10-18 15:04:12 +02:00
parent 2e7f2e4bd0
commit b92a320592
3 changed files with 501 additions and 252 deletions

743
synit-pid1/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[package] [package]
name = "synit-pid1" name = "synit-pid1"
version = "0.0.1" version = "0.0.2"
authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"] authors = ["Tony Garnock-Jones <tonyg@leastfixedpoint.com>"]
edition = "2018" edition = "2018"
@ -23,8 +23,8 @@ strip = true
# syndicate-macros = { path = "localdev/syndicate-rs/syndicate-macros" } # syndicate-macros = { path = "localdev/syndicate-rs/syndicate-macros" }
[dependencies] [dependencies]
syndicate = "0.23" syndicate = "0.29"
syndicate-macros = "0.18" syndicate-macros = "0.24"
clap = "=3.0.0-beta.2" clap = "=3.0.0-beta.2"
clap_generate = "=3.0.0-beta.2" clap_generate = "=3.0.0-beta.2"

View File

@ -42,7 +42,7 @@ impl Pid1Listener {
impl Entity<AnyValue> for Pid1Listener { impl Entity<AnyValue> for Pid1Listener {
} }
async fn handle_sigchld_and_waitpid() -> Result<(), Box<dyn std::error::Error>> { async fn handle_sigchld_and_waitpid() -> ActorResult {
let mut sigchlds = signal(SignalKind::child())?; let mut sigchlds = signal(SignalKind::child())?;
let mut sigints = signal(SignalKind::interrupt())?; let mut sigints = signal(SignalKind::interrupt())?;
let mut sigterms = signal(SignalKind::terminate())?; let mut sigterms = signal(SignalKind::terminate())?;
@ -87,7 +87,7 @@ async fn handle_sigchld_and_waitpid() -> Result<(), Box<dyn std::error::Error>>
} }
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> { async fn main() -> ActorResult {
syndicate::convenient_logging()?; syndicate::convenient_logging()?;
match unistd::setsid() { match unistd::setsid() {