diff --git a/crates/event/src/config.rs b/crates/event/src/config.rs index 498a6b3a0..89156b805 100644 --- a/crates/event/src/config.rs +++ b/crates/event/src/config.rs @@ -424,21 +424,21 @@ impl EventNotifierConfig { let mut adapters = Vec::new(); // Add all enabled webhook configurations - for (_, webhook) in &self.webhook { + for webhook in self.webhook.values() { if webhook.common.enable { adapters.push(AdapterConfig::Webhook(webhook.clone())); } } // Add all enabled Kafka configurations - for (_, kafka) in &self.kafka { + for kafka in self.kafka.values() { if kafka.common.enable { adapters.push(AdapterConfig::Kafka(kafka.clone())); } } // Add all enabled MQTT configurations - for (_, mqtt) in &self.mqtt { + for mqtt in self.mqtt.values() { if mqtt.common.enable { adapters.push(AdapterConfig::Mqtt(mqtt.clone())); } diff --git a/crates/event/src/lib.rs b/crates/event/src/lib.rs index cecddecb2..73411e44d 100644 --- a/crates/event/src/lib.rs +++ b/crates/event/src/lib.rs @@ -6,7 +6,6 @@ mod event; mod global; mod notifier; mod store; -mod target; pub use adapter::create_adapters; #[cfg(all(feature = "kafka", target_os = "linux"))] diff --git a/crates/event/src/store/manager.rs b/crates/event/src/store/manager.rs index ea21a6442..b8534e91e 100644 --- a/crates/event/src/store/manager.rs +++ b/crates/event/src/store/manager.rs @@ -25,18 +25,17 @@ pub static GLOBAL_EVENT_CONFIG: Lazy>> = Lazy: /// EventManager Responsible for managing all operations of the event system #[derive(Debug)] -pub struct EventManager { - api: Arc, +pub struct EventManager { + api: Arc, } -impl EventManager { +impl EventManager { /// Create a new Event Manager - pub async fn new(api: Arc) -> Self { - // Update the global access point at the same time - if let Ok(mut global_api) = GLOBAL_STORE_API.lock() { - if let Some(store) = api.as_any().downcast_ref::() { - *global_api = Some(Arc::new(store.clone())); - } + pub async fn new(api: Arc) -> Self { + // Set the global storage API + { + let mut global_api = GLOBAL_STORE_API.lock().await; + *global_api = Some(api.clone()); } Self { api } @@ -82,10 +81,7 @@ impl EventManager { } save_event_config(self.api.clone(), cfg).await?; - *GLOBAL_EVENT_CONFIG - .lock() - .await - .map_err(|e| Error::msg(format!("Failed to acquire global config lock: {}", e)))? = Some(cfg.clone()); + *GLOBAL_EVENT_CONFIG.lock().await = Some(cfg.clone()); Ok(()) } @@ -199,7 +195,7 @@ async fn save_event_config(api: Arc, config: &EventNotifierCon let config_file = get_event_config_file(); let data = config.marshal()?; - save_config(api, &config_file, data).await; + save_config(api, &config_file, data).await } /// Get the event profile path diff --git a/crates/event/src/store/queue.rs b/crates/event/src/store/queue.rs index e7c859531..f534b7400 100644 --- a/crates/event/src/store/queue.rs +++ b/crates/event/src/store/queue.rs @@ -15,7 +15,7 @@ use uuid::Uuid; pub struct Key { /// Key name pub name: String, - /// Whether or not to compress + /// Whether to compress pub compress: bool, /// filename extension pub extension: String, @@ -35,6 +35,7 @@ impl Key { } /// Convert to string form + #[allow(clippy::inherent_to_string)] pub fn to_string(&self) -> String { let mut key_str = self.name.clone(); if self.item_count > 1 { @@ -47,6 +48,7 @@ impl Key { } /// Parse key from file name +#[allow(clippy::redundant_closure)] pub fn parse_key(filename: &str) -> Key { let compress = filename.ends_with(".snappy"); let filename = if compress { diff --git a/rustfs/src/event.rs b/rustfs/src/event.rs index 00650f868..1ef9db356 100644 --- a/rustfs/src/event.rs +++ b/rustfs/src/event.rs @@ -10,7 +10,7 @@ pub(crate) async fn init_event_notifier(notifier_config: Option) { NotifierConfig::event_load_config(notifier_config) } else { info!("event_config is empty"); - rustfs_event::get_event_notifier_config().clone() + // rustfs_event::get_event_notifier_config().clone() }; info!("using event_config: {:?}", config); diff --git a/rustfs/src/main.rs b/rustfs/src/main.rs index 86cfc976f..4e598a92c 100644 --- a/rustfs/src/main.rs +++ b/rustfs/src/main.rs @@ -48,7 +48,6 @@ use iam::init_iam_sys; use license::init_license; use protos::proto_gen::node_service::node_service_server::NodeServiceServer; use rustfs_config::{DEFAULT_ACCESS_KEY, DEFAULT_SECRET_KEY, RUSTFS_TLS_CERT, RUSTFS_TLS_KEY}; -use rustfs_event::GLOBAL_EventSys; use rustfs_obs::{init_obs, set_global_guard, SystemObserver}; use rustls::ServerConfig; use s3s::{host::MultiDomain, service::S3ServiceBuilder}; @@ -511,7 +510,7 @@ async fn run(opt: config::Opt) -> Result<()> { GLOBAL_ConfigSys.init(store.clone()).await?; // event system configuration - GLOBAL_EventSys.init(store.clone()).await?; + // GLOBAL_EventSys.init(store.clone()).await?; // Initialize event notifier event::init_event_notifier(opt.event_config).await; diff --git a/rustfs/src/storage/access.rs b/rustfs/src/storage/access.rs index 997382140..71225db1c 100644 --- a/rustfs/src/storage/access.rs +++ b/rustfs/src/storage/access.rs @@ -26,9 +26,6 @@ pub async fn authorize_request(req: &mut S3Request, action: Action) -> S3R if let Some(cred) = &req_info.cred { let Ok(iam_store) = iam::get() else { - let _api_rejected_auth_total_key = rustfs_obs::API_REJECTED_AUTH_TOTAL_MD.get_full_metric_name(); - let desc = rustfs_obs::API_REJECTED_AUTH_TOTAL_MD.clone().help; - tracing::info!(api_rejected_auth_total_key = 1_u64, desc); return Err(S3Error::with_message( S3ErrorCode::InternalError, format!("authorize_request {:?}", IamError::IamSysNotInitialized),