diff --git a/packages/infra/client/manager/src/ctx.rs b/packages/infra/client/manager/src/ctx.rs index 2efd9f1aae..817bb9aa2c 100644 --- a/packages/infra/client/manager/src/ctx.rs +++ b/packages/infra/client/manager/src/ctx.rs @@ -1,5 +1,6 @@ use std::{ collections::HashMap, + net::SocketAddr, path::PathBuf, result::Result::{Err, Ok}, sync::Arc, @@ -495,7 +496,7 @@ impl Ctx { let config = IsolateRunnerConfig { actors_path: self.actors_path(), fdb_cluster_path: self.fdb_cluster_path(), - runner_addr: SocketAddr::from([127, 0, 0, 1], self.config().runner.port()), + runner_addr: SocketAddr::from(([127, 0, 0, 1], self.config().runner.port())), }; // Write isolate runner config @@ -618,7 +619,7 @@ impl Ctx { } pub fn fdb_cluster_path(&self) -> PathBuf { - self.config().runtime.data_dir().join("fdb.cluster") + self.config().data_dir().join("fdb.cluster") } pub fn actors_path(&self) -> PathBuf { diff --git a/packages/infra/client/manager/src/utils/mod.rs b/packages/infra/client/manager/src/utils/mod.rs index 1315211fbf..d28fade234 100644 --- a/packages/infra/client/manager/src/utils/mod.rs +++ b/packages/infra/client/manager/src/utils/mod.rs @@ -276,7 +276,7 @@ pub async fn init_fdb_config(config: &Config) -> Result<()> { // Should match Ctx::fdb_cluster_path fs::write( - config.client.runtime.data_dir().join("fdb.cluster"), + config.client.data_dir().join("fdb.cluster"), format!("fdb:fdb@{joined}"), ) .await?; diff --git a/packages/services/pegboard/standalone/gc/src/lib.rs b/packages/services/pegboard/standalone/gc/src/lib.rs index f2c92586d5..27f9cce7f4 100644 --- a/packages/services/pegboard/standalone/gc/src/lib.rs +++ b/packages/services/pegboard/standalone/gc/src/lib.rs @@ -21,6 +21,7 @@ struct ActorRow { client_id: Uuid, failed_start: bool, failed_stop: bool, + failed_exit: bool, } pub async fn start(config: rivet_config::Config, pools: rivet_pools::Pools) -> GlobalResult<()> {