You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/03/03 08:45:02 UTC
[linkis] branch dev-1.3.2 updated: [Feature] DataWorkCloudApplication.initDWCApplication load hostname from "eureka.instance.hostname" first (#4290)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new af880569e [Feature] DataWorkCloudApplication.initDWCApplication load hostname from "eureka.instance.hostname" first (#4290)
af880569e is described below
commit af880569e8987457e87f0729d356add625b4e9e9
Author: rarexixi <ra...@gmail.com>
AuthorDate: Fri Mar 3 16:44:54 2023 +0800
[Feature] DataWorkCloudApplication.initDWCApplication load hostname from "eureka.instance.hostname" first (#4290)
---
.../main/java/org/apache/linkis/DataWorkCloudApplication.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java
index cc35c0b19..6f0256fdf 100644
--- a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java
+++ b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java
@@ -142,12 +142,16 @@ public class DataWorkCloudApplication extends SpringBootServletInitializer {
}
private static void initDWCApplication() {
- String hostName = Utils.getComputerName();
- boolean preferIpAddress = Configuration.PREFER_IP_ADDRESS();
- if (preferIpAddress) {
+ String hostName;
+ if (Configuration.PREFER_IP_ADDRESS()) {
hostName = applicationContext.getEnvironment().getProperty("spring.cloud.client.ip-address");
logger.info(
"using ip address replace hostname, because linkis.discovery.prefer-ip-address: true");
+ } else {
+ hostName = applicationContext.getEnvironment().getProperty("eureka.instance.hostname", "");
+ if (StringUtils.isBlank(hostName)) {
+ hostName = Utils.getComputerName();
+ }
}
serviceInstance = new ServiceInstance();
serviceInstance.setApplicationName(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org