From aea7f411492c3579cda6de149891ee1d3c4c2313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E6=AD=A3=E8=B6=85?= Date: Wed, 25 Feb 2026 18:01:52 +0800 Subject: [PATCH] refactor(app): route admin/object globals through AppContext (#1954) --- rustfs/src/app/admin_usecase.rs | 5 +---- rustfs/src/app/object_usecase.rs | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/rustfs/src/app/admin_usecase.rs b/rustfs/src/app/admin_usecase.rs index 770370e5e..a24d21f0a 100644 --- a/rustfs/src/app/admin_usecase.rs +++ b/rustfs/src/app/admin_usecase.rs @@ -98,10 +98,7 @@ impl DefaultAdminUsecase { } fn endpoints(&self) -> Option { - self.context - .as_ref() - .and_then(|context| context.endpoints().handle()) - .or_else(|| rustfs_ecstore::GLOBAL_Endpoints.get().cloned()) + self.context.as_ref().and_then(|context| context.endpoints().handle()) } fn app_error(code: S3ErrorCode, message: impl Into) -> ApiError { diff --git a/rustfs/src/app/object_usecase.rs b/rustfs/src/app/object_usecase.rs index 59de9ae90..62c7708e8 100644 --- a/rustfs/src/app/object_usecase.rs +++ b/rustfs/src/app/object_usecase.rs @@ -201,10 +201,7 @@ impl DefaultObjectUsecase { } fn bucket_metadata_sys(&self) -> Option>> { - self.context - .as_ref() - .and_then(|context| context.bucket_metadata().handle()) - .or_else(|| rustfs_ecstore::bucket::metadata_sys::GLOBAL_BucketMetadataSys.get().cloned()) + self.context.as_ref().and_then(|context| context.bucket_metadata().handle()) } #[instrument(level = "debug", skip(self, fs, req))]