From c99bfe69ea19497895d32669fd15c689b86035d8 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 28 Jan 2025 15:12:03 +0100 Subject: admin api: new router_v2 with unified path syntax --- src/api/generic_server.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/api/generic_server.rs') diff --git a/src/api/generic_server.rs b/src/api/generic_server.rs index 283abdd4..ce2ff7b7 100644 --- a/src/api/generic_server.rs +++ b/src/api/generic_server.rs @@ -1,3 +1,4 @@ +use std::borrow::Cow; use std::convert::Infallible; use std::fs::{self, Permissions}; use std::os::unix::fs::PermissionsExt; @@ -37,7 +38,7 @@ use garage_util::socket_address::UnixOrTCPSocketAddress; use crate::helpers::{BoxBody, ErrorBody}; pub(crate) trait ApiEndpoint: Send + Sync + 'static { - fn name(&self) -> &'static str; + fn name(&self) -> Cow<'_, str>; fn add_span_attributes(&self, span: SpanRef<'_>); } -- cgit v1.2.3 From af1a53083452e7953736261db57aea4a68aa4278 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 28 Jan 2025 15:44:14 +0100 Subject: admin api: refactor using macro --- src/api/generic_server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/api/generic_server.rs') diff --git a/src/api/generic_server.rs b/src/api/generic_server.rs index ce2ff7b7..5a9b29eb 100644 --- a/src/api/generic_server.rs +++ b/src/api/generic_server.rs @@ -38,7 +38,7 @@ use garage_util::socket_address::UnixOrTCPSocketAddress; use crate::helpers::{BoxBody, ErrorBody}; pub(crate) trait ApiEndpoint: Send + Sync + 'static { - fn name(&self) -> Cow<'_, str>; + fn name(&self) -> Cow<'static, str>; fn add_span_attributes(&self, span: SpanRef<'_>); } -- cgit v1.2.3