gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-13 15:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next-v2

Browse Source
This commit is contained in:
Alex Auvolat
2025-02-05 21:00:19 +01:00
parent 71655c1e89 d3226bfa91
commit 61f3de6496
23 changed files with 21 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/api_server.rs
-3
View File
@@ -2,7 +2,6 @@ use std::borrow::Cow;
use std::sync::Arc;
use argon2::password_hash::PasswordHash;
use async_trait::async_trait;
use http::header::{HeaderValue, ACCESS_CONTROL_ALLOW_ORIGIN, AUTHORIZATION};
use hyper::{body::Incoming as IncomingBody, Request, Response};
@@ -55,7 +54,6 @@ impl Rpc for AdminRpc {
type Response = Result<AdminRpcResponse, GarageError>;
}
#[async_trait]
impl EndpointHandler<AdminRpc> for AdminApiServer {
async fn handle(
self: &Arc<Self>,
@@ -196,7 +194,6 @@ impl AdminApiServer {
struct ArcAdminApiServer(Arc<AdminApiServer>);
#[async_trait]
impl ApiHandler for ArcAdminApiServer {
const API_NAME: &'static str = "admin";
const API_NAME_DISPLAY: &'static str = "Admin";
src/api/admin/repair.rs
+2 -1
View File
@@ -1,3 +1,4 @@
use std::future::Future;
use std::sync::Arc;
use std::time::Duration;
@@ -104,7 +105,7 @@ trait TableRepair: Send + Sync + 'static {
&mut self,
garage: &Garage,
entry: <<Self as TableRepair>::T as TableSchema>::E,
) -> impl std::future::Future<Output = Result<bool, GarageError>> + Send;
) -> impl Future<Output = Result<bool, GarageError>> + Send;
}
struct TableRepairWorker<T: TableRepair> {