Skip to content

Commit ed12894

Browse files
authored
Merge pull request #2139 from oasisprotocol/kostko/fix/rofl-appd-startup
rofl-appd: Fix API server startup
2 parents 13c66b6 + 30a5687 commit ed12894

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rofl-appd/src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ where
2929
let env: Arc<dyn state::Env> = Arc::new(state::EnvImpl::new(env));
3030

3131
// Server configuration.
32-
let rocket_cfg = Figment::new().join(("address", cfg.address));
32+
let rocket_cfg = Figment::from(rocket::config::Config::default())
33+
.select("default")
34+
.merge(("address", cfg.address))
35+
.merge(("reuse", true));
3336

3437
rocket::custom(rocket_cfg)
3538
.manage(env)

rofl-containers/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rofl-containers"
3-
version = "0.3.2"
3+
version = "0.3.3"
44
edition = "2021"
55

66
[dependencies]

rofl-containers/src/main.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,14 @@ impl App for ContainersApp {
7777
address: ROFL_APPD_ADDRESS,
7878
kms: kms.clone(),
7979
};
80-
let _ = rofl_appd::start(cfg, env.clone()).await;
80+
let appd_logger = logger.clone();
81+
let appd_env = env.clone();
82+
tokio::spawn(async move {
83+
if let Err(err) = rofl_appd::start(cfg, appd_env).await {
84+
slog::error!(appd_logger, "failed to start API server"; "err" => ?err);
85+
process::abort();
86+
}
87+
});
8188

8289
// Initialize containers.
8390
slog::info!(logger, "initializing container environment");

0 commit comments

Comments
 (0)