rofl-appd: Fix API server startup

oasisprotocol · Jan 22, 2025 · 30a5687 · 30a5687
1 parent 13c66b6
commit 30a5687
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rofl-appd/src/lib.rs b/rofl-appd/src/lib.rs
@@ -29,7 +29,10 @@ where
     let env: Arc<dyn state::Env> = Arc::new(state::EnvImpl::new(env));
 
     // Server configuration.
-    let rocket_cfg = Figment::new().join(("address", cfg.address));
+    let rocket_cfg = Figment::from(rocket::config::Config::default())
+        .select("default")
+        .merge(("address", cfg.address))
+        .merge(("reuse", true));
 
     rocket::custom(rocket_cfg)
         .manage(env)

diff --git a/rofl-containers/Cargo.toml b/rofl-containers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rofl-containers"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2021"
 
 [dependencies]

diff --git a/rofl-containers/src/main.rs b/rofl-containers/src/main.rs
@@ -77,7 +77,14 @@ impl App for ContainersApp {
             address: ROFL_APPD_ADDRESS,
             kms: kms.clone(),
         };
-        let _ = rofl_appd::start(cfg, env.clone()).await;
+        let appd_logger = logger.clone();
+        let appd_env = env.clone();
+        tokio::spawn(async move {
+            if let Err(err) = rofl_appd::start(cfg, appd_env).await {
+                slog::error!(appd_logger, "failed to start API server"; "err" => ?err);
+                process::abort();
+            }
+        });
 
         // Initialize containers.
         slog::info!(logger, "initializing container environment");