You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2021/08/09 13:14:52 UTC
[incubator-inlong] branch master updated:
[INLONG-1432][InLong-Dataproxy][InLong-Agent] The manager url of agent and
dataproxy need to be updated since manager merged openapi and api into one
module (#1433)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new c549a11 [INLONG-1432][InLong-Dataproxy][InLong-Agent] The manager url of agent and dataproxy need to be updated since manager merged openapi and api into one module (#1433)
c549a11 is described below
commit c549a114cab4904ad24a05c123e86477e116c7cd
Author: ziruipeng <zp...@connect.ust.hk>
AuthorDate: Mon Aug 9 21:14:45 2021 +0800
[INLONG-1432][InLong-Dataproxy][InLong-Agent] The manager url of agent and dataproxy need to be updated since manager merged openapi and api into one module (#1433)
Co-authored-by: stingpeng <st...@tencent.com>
---
.../apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java | 2 +-
.../src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
index d257faf..95c92f7 100644
--- a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
+++ b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/fetcher/constants/FetcherConstants.java
@@ -34,7 +34,7 @@ public class FetcherConstants {
public static final String DEFAULT_AGENT_TDM_VIP_HTTP_PATH = "/getilmvirtualip";
public static final String AGENT_MANAGER_VIP_HTTP_PREFIX_PATH = "agent.manager.vip.http.prefix.path";
- public static final String DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH = "/openapi/inlong/manager/agent";
+ public static final String DEFAULT_AGENT_MANAGER_VIP_HTTP_PREFIX_PATH = "/api/inlong/manager/openapi/agent";
public static final String AGENT_MANAGER_TASK_HTTP_PATH = "agent.manager.vip.http.task.path";
public static final String DEFAULT_AGENT_MANAGER_TASK_HTTP_PATH = "/file_agent/taskconf";
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
index e04bfbc..8872167 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
+++ b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/ConfigManager.java
@@ -253,7 +253,7 @@ public class ConfigManager {
private boolean checkWithManager(String host) {
HttpGet httpGet = null;
try {
- String url = "http://" + host + "/openapi/inlong/manager/dataproxy/getConfig";
+ String url = "http://" + host + "/api/inlong/manager/openapi/dataproxy/getConfig";
LOG.info("start to request {} to get config info", url);
httpGet = new HttpGet(url);
httpGet.addHeader(HttpHeaders.CONNECTION, "close");