diff options
| author | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-14 13:03:11 +0100 |
|---|---|---|
| committer | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-14 13:11:33 +0100 |
| commit | 315169501173c1cf5f78397375fe05ea2ebb77f0 (patch) | |
| tree | 777b81f299208afb795b84e9626863b8bbaddd81 /src/garage/server.rs | |
| parent | f034e834fa70f579bfd85745aea533b4328cbce4 (diff) | |
| parent | 61f3de649646d098812e6ddb814e20ce7e66ad94 (diff) | |
| download | garage-315169501173c1cf5f78397375fe05ea2ebb77f0.tar.gz garage-315169501173c1cf5f78397375fe05ea2ebb77f0.zip | |
Merge branch 'next-v2' into 1686a/s3-redirects
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 9e58fa6d..131cc8aa 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -14,7 +14,6 @@ use garage_web::WebServer; #[cfg(feature = "k2v")] use garage_api_k2v::api_server::K2VApiServer; -use crate::admin::*; use crate::secrets::{fill_secrets, Secrets}; #[cfg(feature = "telemetry-otlp")] use crate::tracing_setup::*; @@ -66,6 +65,7 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er info!("Initialize Admin API server and metrics collector..."); let admin_server = AdminApiServer::new( garage.clone(), + background.clone(), #[cfg(feature = "metrics")] metrics_exporter, ); @@ -73,9 +73,6 @@ pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Er info!("Launching internal Garage cluster communications..."); let run_system = tokio::spawn(garage.system.clone().run(watch_cancel.clone())); - info!("Create admin RPC handler..."); - AdminRpcHandler::new(garage.clone(), background.clone()); - // ---- Launch public-facing API servers ---- let mut servers = vec![]; |