mirror of
https://github.com/rustfs/rustfs.git
synced 2026-07-27 16:48:58 +00:00
houseme
98be7df0f5
* improve code for audit * improve code ecfs.rs * improve code * improve code for ecfs.rs * feat(storage): refactor audit and notification with OperationHelper This commit introduces a significant refactoring of the audit logging and event notification mechanisms within `ecfs.rs`. The core of this change is the new `OperationHelper` struct, which encapsulates and simplifies the logic for both concerns. It replaces the previous `AuditHelper` and manual event dispatching. Key improvements include: - **Unified Handling**: `OperationHelper` manages both audit and notification builders, providing a single, consistent entry point for S3 operations. - **RAII for Automation**: By leveraging the `Drop` trait, the helper automatically dispatches logs and notifications when it goes out of scope. This simplifies S3 method implementations and ensures cleanup even on early returns. - **Fluent API**: A builder-like pattern with methods such as `.object()`, `.version_id()`, and `.suppress_event()` makes the code more readable and expressive. - **Context-Aware Logic**: The helper's `.complete()` method intelligently populates log details based on the operation's `S3Result` and only triggers notifications on success. - **Modular Design**: All helper logic is now isolated in `rustfs/src/storage/helper.rs`, improving separation of concerns and making `ecfs.rs` cleaner. This refactoring significantly enhances code clarity, reduces boilerplate, and improves the robustness of logging and notification handling across the storage layer. * fix * fix * fix * fix * fix * fix * fix * improve code for audit and notify * fix * fix * fix
73 lines
2.0 KiB
Rust
73 lines
2.0 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use rustfs_targets::{TargetError, arn::TargetID};
|
|
use std::io;
|
|
use thiserror::Error;
|
|
|
|
/// Errors related to the notification system's lifecycle.
|
|
#[derive(Debug, Error)]
|
|
pub enum LifecycleError {
|
|
/// Error indicating the system has already been initialized.
|
|
#[error("System has already been initialized")]
|
|
AlreadyInitialized,
|
|
|
|
/// Error indicating the system has not been initialized yet.
|
|
#[error("System has not been initialized")]
|
|
NotInitialized,
|
|
}
|
|
|
|
/// Error types for the notification system
|
|
#[derive(Debug, Error)]
|
|
pub enum NotificationError {
|
|
#[error("Target error: {0}")]
|
|
Target(#[from] TargetError),
|
|
|
|
#[error("Configuration error: {0}")]
|
|
Configuration(String),
|
|
|
|
#[error("ARN not found: {0}")]
|
|
ARNNotFound(String),
|
|
|
|
#[error("Invalid ARN: {0}")]
|
|
InvalidARN(String),
|
|
|
|
#[error("Bucket notification error: {0}")]
|
|
BucketNotification(String),
|
|
|
|
#[error("Rule configuration error: {0}")]
|
|
RuleConfiguration(String),
|
|
|
|
#[error("System lifecycle error: {0}")]
|
|
Lifecycle(#[from] LifecycleError),
|
|
|
|
#[error("I/O error: {0}")]
|
|
Io(io::Error),
|
|
|
|
#[error("Failed to read configuration: {0}")]
|
|
ReadConfig(String),
|
|
|
|
#[error("Failed to save configuration: {0}")]
|
|
SaveConfig(String),
|
|
|
|
#[error("Target '{0}' not found")]
|
|
TargetNotFound(TargetID),
|
|
|
|
#[error("System initialization error: {0}")]
|
|
Initialization(String),
|
|
|
|
#[error("Storage not available: {0}")]
|
|
StorageNotAvailable(String),
|
|
}
|