From a770600fa74b335e1a7602340b093eee72d12fef Mon Sep 17 00:00:00 2001
From: weisd <im@weisd.in>
Date: Tue, 8 Apr 2025 22:27:39 +0800
Subject: [PATCH] merge license

---
 iam/src/lib.rs          | 2 +-
 iam/src/manager.rs      | 2 +-
 iam/src/store/object.rs | 2 +-
 rustfs/src/license.rs   | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/iam/src/lib.rs b/iam/src/lib.rs
index 5d3ca626..a37c0d91 100644
--- a/iam/src/lib.rs
+++ b/iam/src/lib.rs
@@ -51,7 +51,7 @@ pub fn get_global_action_cred() -> Option<Credentials> {
     GLOBAL_ACTIVE_CRED.get().cloned()
 }
 
-#[instrument]
+#[instrument(skip(ecstore))]
 pub async fn init_iam_sys(ecstore: Arc<ECStore>) -> Result<()> {
     debug!("init iam system");
     let s = IamCache::new(ObjectStore::new(ecstore)).await;
diff --git a/iam/src/manager.rs b/iam/src/manager.rs
index 19589d36..2eb8a6f0 100644
--- a/iam/src/manager.rs
+++ b/iam/src/manager.rs
@@ -39,7 +39,7 @@ use tokio::{
     },
 };
 use tracing::error;
-use tracing::{debug, warn};
+use tracing::warn;
 
 const IAM_FORMAT_FILE: &str = "format.json";
 const IAM_FORMAT_VERSION_1: i32 = 1;
diff --git a/iam/src/store/object.rs b/iam/src/store/object.rs
index 7642fe2e..cf365f56 100644
--- a/iam/src/store/object.rs
+++ b/iam/src/store/object.rs
@@ -24,7 +24,7 @@ use serde::{de::DeserializeOwned, Serialize};
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::broadcast::{self, Receiver as B_Receiver};
 use tokio::sync::mpsc::{self, Sender};
-use tracing::{debug, info, warn};
+use tracing::{info, warn};
 
 lazy_static! {
     pub static ref IAM_CONFIG_PREFIX: String = format!("{}/iam", RUSTFS_CONFIG_PREFIX);
diff --git a/rustfs/src/license.rs b/rustfs/src/license.rs
index 58daa195..25d09c82 100644
--- a/rustfs/src/license.rs
+++ b/rustfs/src/license.rs
@@ -27,7 +27,9 @@ pub fn get_license() -> Option<Token> {
     LICENSE.get().cloned()
 }
 
+#[allow(unreachable_code)]
 pub fn license_check() -> Result<()> {
+    return Ok(());
     let inval_license = LICENSE.get().map(|token| {
         if token.expired < SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() {
             error!("License expired");