diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/audit/CNAuditLogger.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/audit/CNAuditLogger.java index ccc1008eec31..75d1fd8e0ab0 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/audit/CNAuditLogger.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/audit/CNAuditLogger.java @@ -42,5 +42,9 @@ public CNAuditLogger(ConfigManager configManager) { } @Override - public void log(IAuditEntity auditLogFields, Supplier log) {} + public void log(IAuditEntity auditLogFields, Supplier log) { + if (!isAuditLogEnabled()) { + return; + } + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/DNAuditLogger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/DNAuditLogger.java index 3a07ac9aa69b..8c5b6be28882 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/DNAuditLogger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/DNAuditLogger.java @@ -57,10 +57,18 @@ private static InsertRowStatement generateInsertStatement( public void createViewIfNecessary() {} @Override - public synchronized void log(IAuditEntity auditLogFields, Supplier log) {} + public synchronized void log(IAuditEntity auditLogFields, Supplier log) { + if (!isAuditLogEnabled()) { + return; + } + } public void logFromCN(AuditLogFields auditLogFields, String log, int nodeId) - throws IllegalPathException {} + throws IllegalPathException { + if (!isAuditLogEnabled()) { + return; + } + } private static class DNAuditLoggerHolder { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/audit/AbstractAuditLogger.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/audit/AbstractAuditLogger.java index cec033663210..85d8b3e671f4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/audit/AbstractAuditLogger.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/audit/AbstractAuditLogger.java @@ -40,7 +40,16 @@ public abstract class AbstractAuditLogger { public static final String AUDIT_LOG_LOG = "log"; private static final CommonConfig CONFIG = CommonDescriptor.getInstance().getConfig(); - protected static final boolean IS_AUDIT_LOG_ENABLED = CONFIG.isEnableAuditLog(); + + /** + * Check if audit log is enabled. This method reads the configuration dynamically instead of using + * a static final field to ensure that the configuration is properly loaded before being used. + * + * @return true if audit log is enabled, false otherwise + */ + protected static boolean isAuditLogEnabled() { + return CONFIG.isEnableAuditLog(); + } public abstract void log(IAuditEntity auditLogFields, Supplier log);