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 2022/02/10 13:28:51 UTC
[incubator-linkis] branch dev-1.1.0-datasource updated: [Feature] unify the log config file of ec to log4j2.xml (#1425)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.0-datasource by this push:
new 01cd587 [Feature] unify the log config file of ec to log4j2.xml (#1425)
01cd587 is described below
commit 01cd5870eceb15aee36e86b8ef3d7f000cbd4a70
Author: legendtkl <ta...@gmail.com>
AuthorDate: Thu Feb 10 21:26:50 2022 +0800
[Feature] unify the log config file of ec to log4j2.xml (#1425)
---
.../flink/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../engineconn-plugins/hive/src/main/assembly/distribution.xml | 3 +--
.../hive/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../engineconn-plugins/io_file/src/main/assembly/distribution.xml | 3 +--
.../io_file/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../engineconn-plugins/jdbc/src/main/assembly/distribution.xml | 3 +--
.../jdbc/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../engineconn-plugins/pipeline/src/main/assembly/distribution.xml | 3 +--
.../pipeline/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../python/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../shell/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../spark/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} | 0
.../linkis/manager/engineplugin/common/conf/EnvConfiguration.scala | 2 +-
13 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/flink/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/flink/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/flink/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml
index b1e30b1..53bfc72 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/assembly/distribution.xml
@@ -230,8 +230,7 @@
<fileSet>
<directory>${basedir}/src/main/resources</directory>
<includes>
- <include>linkis-engineconn.properties</include>
- <include>log4j2-engineconn.xml</include>
+ <include>*</include>
</includes>
<fileMode>0777</fileMode>
<outputDirectory>/dist/v${hive.version}/conf</outputDirectory>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/hive/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/hive/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
index 1ec7850..5677abc 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/assembly/distribution.xml
@@ -46,8 +46,7 @@
<fileSet>
<directory>${basedir}/src/main/resources</directory>
<includes>
- <include>linkis-engineconn.properties</include>
- <include>log4j2-engineconn.xml</include>
+ <include>*</include>
</includes>
<fileMode>0777</fileMode>
<outputDirectory>/dist/v${io_file.version}/conf</outputDirectory>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/io_file/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml
index 77af224..8abedc5 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/assembly/distribution.xml
@@ -46,8 +46,7 @@
<fileSet>
<directory>${basedir}/src/main/resources</directory>
<includes>
- <include>linkis-engineconn.properties</include>
- <include>log4j2-engineconn.xml</include>
+ <include>*</include>
</includes>
<fileMode>0777</fileMode>
<outputDirectory>/dist/v${jdbc.version}/conf</outputDirectory>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/jdbc/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml
index 4418550..45ba5b7 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/assembly/distribution.xml
@@ -47,8 +47,7 @@
<fileSet>
<directory>${basedir}/src/main/resources</directory>
<includes>
- <include>linkis-engineconn.properties</include>
- <include>log4j2-engineconn.xml</include>
+ <include>*</include>
</includes>
<fileMode>0777</fileMode>
<outputDirectory>/dist/v${pipeline.version}/conf</outputDirectory>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/pipeline/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/python/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/python/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/spark/src/main/resources/log4j2.xml
similarity index 100%
rename from linkis-engineconn-plugins/engineconn-plugins/spark/src/main/resources/log4j2-engineconn.xml
rename to linkis-engineconn-plugins/engineconn-plugins/spark/src/main/resources/log4j2.xml
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
index bfdf176..0ccaa9b 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/conf/EnvConfiguration.scala
@@ -47,7 +47,7 @@ object EnvConfiguration {
val ENGINE_CONN_DEBUG_ENABLE = CommonVars("wds.linkis.engineconn.debug.enable", false)
- val LOG4J2_XML_FILE = CommonVars[String]("wds.linkis.engineconn.log4j2.xml.file", "log4j2-engineconn.xml")
+ val LOG4J2_XML_FILE = CommonVars[String]("wds.linkis.engineconn.log4j2.xml.file", "log4j2.xml")
val LINKIS_PUBLIC_MODULE_PATH = CommonVars("wds.linkis.public_module.path", Configuration.getLinkisHome + "/lib/linkis-commons/public-module")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org