`registry::run` now accepts an `Option<PathBuf>` config override so the umbrella binary's `--config` flag (and its clap-bound `MAESTRO_CONFIG` env var) reach the registry, mirroring how the daemon already consumed the override.
52 lines
1.6 KiB
Rust
52 lines
1.6 KiB
Rust
//! Public entry point: load config, bind, serve until SIGINT.
|
|
//!
|
|
//! Extracted from the per-binary `main.rs` (NAP-245) so the umbrella `maestro`
|
|
//! binary can dispatch `maestro registry` here.
|
|
|
|
use std::error::Error;
|
|
use std::path::PathBuf;
|
|
|
|
use tokio::net::TcpListener;
|
|
|
|
use crate::{
|
|
default_config_path, load_config, router, Registry, ENV_REGISTRY_BIND_ADDR, ENV_TOKEN,
|
|
};
|
|
|
|
/// Run the registry. `config_override` is the top-level `--config` flag from
|
|
/// the umbrella binary (also populated from `$MAESTRO_CONFIG` by clap).
|
|
pub async fn run(config_override: Option<PathBuf>) -> Result<(), Box<dyn Error>> {
|
|
let config_path: PathBuf = match config_override {
|
|
Some(p) => p,
|
|
None => default_config_path()?,
|
|
};
|
|
let env_token = std::env::var(ENV_TOKEN).ok();
|
|
let env_bind = std::env::var(ENV_REGISTRY_BIND_ADDR).ok();
|
|
let token_from_env = env_token.is_some();
|
|
let bind_from_env = env_bind.is_some();
|
|
let config = load_config(&config_path, env_token, env_bind.as_deref())?;
|
|
tracing::info!(
|
|
config = %config_path.display(),
|
|
bind = %config.bind_addr,
|
|
token_from_env,
|
|
bind_from_env,
|
|
"loaded config"
|
|
);
|
|
|
|
let listener = TcpListener::bind(config.bind_addr).await?;
|
|
let bound = listener.local_addr()?;
|
|
tracing::info!(addr = %bound, "registry listening");
|
|
|
|
let registry = Registry::new();
|
|
let app = router(registry, config.token);
|
|
|
|
let shutdown = async {
|
|
let _ = tokio::signal::ctrl_c().await;
|
|
tracing::info!("ctrl-c received — shutting down");
|
|
};
|
|
|
|
axum::serve(listener, app)
|
|
.with_graceful_shutdown(shutdown)
|
|
.await?;
|
|
Ok(())
|
|
}
|