[linkis] branch dev-1.3.2 updated: [Feature]Optimization of old version code (#4322)

[peacewong]

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 eacca9169 [Feature]Optimization of old version code (#4322)
eacca9169 is described below

commit eacca9169b214b76db4cb5fa8ce0d5565246e22f
Author: huangKai-2323 <62878639+huangkai-2...@users.noreply.github.com>
AuthorDate: Tue Mar 7 17:55:24 2023 +0800

    [Feature]Optimization of old version code (#4322)
---
 docs/configuration/linkis-entrance.md                            | 2 +-
 .../linkis/entrance/persistence/QueryPersistenceEngine.java      | 2 +-
 .../org/apache/linkis/entrance/conf/EntranceConfiguration.scala  | 9 ++-------
 .../org/apache/linkis/entrance/utils/JobHistoryHelper.scala      | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/docs/configuration/linkis-entrance.md 
b/docs/configuration/linkis-entrance.md
index 333e35b5f..03f62da4a 100644
--- a/docs/configuration/linkis-entrance.md
+++ b/docs/configuration/linkis-entrance.md
@@ -7,7 +7,7 @@
 |linkis-entrance|wds.linkis.entrance.listenerBus.queue.capacity|5000 
|queue.capacity|
 |linkis-entrance|wds.linkis.entrance.job.persist.wait.max|5m|persist.wait.max|
 |linkis-entrance|wds.linkis.entrance.multi.entrance.flag| true |entrance.flag|
-|linkis-entrance|wds.linkis.query.application.name|linkis-ps-jobhistory 
|application.name|
+|linkis-entrance|wds.linkis.jobhistory.application.name|linkis-ps-jobhistory 
|application.name|
 |linkis-entrance|wds.linkis.entrance.config.log.path|  |config.log.path |
 |linkis-entrance|wds.linkis.entrance.log.cacheMax|500| log.cacheMax |
 |linkis-entrance|wds.linkis.entrance.log.defaultCharSet| utf-8 
|log.defaultCharSet|
diff --git 
a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceEngine.java
 
b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceEngine.java
index 3ae711a87..2fdf4b9b4 100644
--- 
a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceEngine.java
+++ 
b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceEngine.java
@@ -66,7 +66,7 @@ public class QueryPersistenceEngine extends 
AbstractPersistenceEngine {
     */
     sender =
         Sender.getSender(
-            
EntranceConfiguration$.MODULE$.QUERY_PERSISTENCE_SPRING_APPLICATION_NAME().getValue());
+            
EntranceConfiguration$.MODULE$.JOBHISTORY_SPRING_APPLICATION_NAME().getValue());
   }
 
   private JobRespProtocol sendToJobHistoryAndRetry(RequestProtocol jobReq, 
String msg)
diff --git 
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
 
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
index 4b6230299..fca5a61aa 100644
--- 
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
+++ 
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
@@ -32,13 +32,8 @@ object EntranceConfiguration {
 
   val MULTI_ENTRANCE_CONDITION = 
CommonVars("wds.linkis.entrance.multi.entrance.flag", true)
 
-  /**
-   * QUERY_PERSISTENCE_SPRING_APPLICATION_NAME is the name of the application 
that represents the
-   * query module in springcloud QUERY_PERSISTENCE_SPRING_APPLICATION_NAME
-   * 是表示query模块在springcloud中的应用名称
-   */
-  val QUERY_PERSISTENCE_SPRING_APPLICATION_NAME =
-    CommonVars("wds.linkis.query.application.name", "linkis-ps-jobhistory")
+  val JOBHISTORY_SPRING_APPLICATION_NAME =
+    CommonVars("wds.linkis.jobhistory.application.name", 
"linkis-ps-jobhistory")
 
   /**
    * DEFAULT_LOGPATH_PREFIX is the prefix that represents the default log 
storage path
diff --git 
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
 
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
index 0fc7e6e48..cfe14672c 100644
--- 
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
+++ 
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
@@ -45,7 +45,7 @@ import com.google.common.net.InetAddresses
 object JobHistoryHelper extends Logging {
 
   private val sender =
-    
Sender.getSender(EntranceConfiguration.QUERY_PERSISTENCE_SPRING_APPLICATION_NAME.getValue)
+    
Sender.getSender(EntranceConfiguration.JOBHISTORY_SPRING_APPLICATION_NAME.getValue)
 
   private val SUCCESS_FLAG = 0
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@linkis.apache.org
For additional commands, e-mail: commits-h...@linkis.apache.org