You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by al...@apache.org on 2024/07/17 06:08:00 UTC
(inlong) branch master updated: [INLONG-10633][Agent] The initialization function of AuditUtils needs to pass in the configuration (#10634)
This is an automated email from the ASF dual-hosted git repository.
aloyszhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 5e9112fab5 [INLONG-10633][Agent] The initialization function of AuditUtils needs to pass in the configuration (#10634)
5e9112fab5 is described below
commit 5e9112fab5d36226cefadda25e6bfe0af93ef08e
Author: justinwwhuang <hw...@163.com>
AuthorDate: Wed Jul 17 14:07:55 2024 +0800
[INLONG-10633][Agent] The initialization function of AuditUtils needs to pass in the configuration (#10634)
---
.../main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java | 6 +++---
.../src/main/java/org/apache/inlong/agent/core/AgentMain.java | 2 +-
.../src/main/java/org/apache/inlong/agent/installer/Main.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
index 3dc920ed5e..9cc5e5fd6e 100644
--- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
+++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java
@@ -17,7 +17,7 @@
package org.apache.inlong.agent.metrics.audit;
-import org.apache.inlong.agent.conf.AgentConfiguration;
+import org.apache.inlong.agent.conf.AbstractConfiguration;
import org.apache.inlong.audit.AuditOperator;
import org.apache.inlong.audit.entity.AuditComponent;
@@ -59,12 +59,12 @@ public class AuditUtils {
public static int AUDIT_ID_AGENT_ADD_INSTANCE_MEM_FAILED = 1073741842;
public static int AUDIT_ID_AGENT_DEL_INSTANCE_MEM_UNUSUAL = 1073741843;
private static boolean IS_AUDIT = true;
+ private static AbstractConfiguration conf;
/**
* Init audit config
*/
- public static void initAudit() {
- AgentConfiguration conf = AgentConfiguration.getAgentConf();
+ public static void initAudit(AbstractConfiguration conf) {
IS_AUDIT = conf.getBoolean(AUDIT_ENABLE, DEFAULT_AUDIT_ENABLE);
if (IS_AUDIT) {
AuditOperator.getInstance().setAuditProxy(AuditComponent.AGENT, conf.get(AGENT_MANAGER_ADDR),
diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java
index 3584ac033f..695c27e231 100644
--- a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java
+++ b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/AgentMain.java
@@ -110,7 +110,7 @@ public class AgentMain {
CommandLine cl = initOptions(args);
assert cl != null;
initAgentConf(cl);
- AuditUtils.initAudit();
+ AuditUtils.initAudit(AgentConfiguration.getAgentConf());
AgentManager manager = new AgentManager();
try {
manager.start();
diff --git a/inlong-agent/agent-installer/src/main/java/org/apache/inlong/agent/installer/Main.java b/inlong-agent/agent-installer/src/main/java/org/apache/inlong/agent/installer/Main.java
index f03739b3d3..121282f5d3 100644
--- a/inlong-agent/agent-installer/src/main/java/org/apache/inlong/agent/installer/Main.java
+++ b/inlong-agent/agent-installer/src/main/java/org/apache/inlong/agent/installer/Main.java
@@ -110,7 +110,7 @@ public class Main {
CommandLine cl = initOptions(args);
assert cl != null;
initAgentConf(cl);
- AuditUtils.initAudit();
+ AuditUtils.initAudit(InstallerConfiguration.getInstallerConf());
Manager manager = new Manager();
try {
manager.start();