aboutsummaryrefslogtreecommitdiff
path: root/src/garage
diff options
context:
space:
mode:
Diffstat (limited to 'src/garage')
-rw-r--r--src/garage/server.rs4
-rw-r--r--src/garage/tests/common/garage.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs
index b11f8417..1e276e9e 100644
--- a/src/garage/server.rs
+++ b/src/garage/server.rs
@@ -47,7 +47,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
let garage = Garage::new(config.clone(), db, background);
info!("Initialize tracing...");
- if let Some(export_to) = config.admin_api.otlp_export_traces_to {
+ if let Some(export_to) = config.admin.trace_sink {
init_tracing(&export_to, garage.system.id)?;
}
@@ -70,7 +70,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
info!("Configure and run admin web server...");
let admin_server = tokio::spawn(
- admin_server_init.run(config.admin_api.bind_addr, wait_from(watch_cancel.clone())),
+ admin_server_init.run(config.admin.api_bind_addr, wait_from(watch_cancel.clone())),
);
// Stuff runs
diff --git a/src/garage/tests/common/garage.rs b/src/garage/tests/common/garage.rs
index 12cf946b..36adb55e 100644
--- a/src/garage/tests/common/garage.rs
+++ b/src/garage/tests/common/garage.rs
@@ -66,8 +66,8 @@ bind_addr = "127.0.0.1:{web_port}"
root_domain = ".web.garage"
index = "index.html"
-[admin_api]
-bind_addr = "127.0.0.1:{admin_port}"
+[admin]
+api_bind_addr = "127.0.0.1:{admin_port}"
"#,
path = path.display(),
secret = GARAGE_TEST_SECRET,