You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/30 10:00:14 UTC
[incubator-linkis] branch dev-1.3.0 updated: Adjust linkis-dist distribution.xml (#3577)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new afaeb0996 Adjust linkis-dist distribution.xml (#3577)
afaeb0996 is described below
commit afaeb099686a6db2e0e0c6141e362af277f70125
Author: aiceflower <ki...@sina.com>
AuthorDate: Fri Sep 30 18:00:08 2022 +0800
Adjust linkis-dist distribution.xml (#3577)
Co-authored-by: casionone <ca...@gmail.com>
---
.../linkis/templates/configmap-linkis-config.yaml | 33 ++++++++++++++--------
linkis-dist/pom.xml | 2 +-
linkis-dist/src/main/assembly/distribution.xml | 20 +++++++++++++
3 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
index ee23d7868..650cc453b 100644
--- a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
+++ b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
@@ -36,18 +36,27 @@ data:
log4j2.xml: |
<?xml version="1.0" encoding="UTF-8"?>
- <Configuration status="INFO">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
- </Configuration>
+ <configuration status="error" monitorInterval="30">
+ <appenders>
+ <RollingFile name="RollingFile" append="true" fileName="${env:LINKIS_LOG_DIR}/${sys:serviceName}.log"
+ filePattern="${env:LINKIS_LOG_DIR}/$${date:yyyy-MM}/${sys:serviceName}/linkis-log-%d{yyyy-MM-dd-hh}-%i.log">
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="100MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="10"/>
+ </RollingFile>
+ </appenders>
+ <loggers>
+ <root level="INFO">
+ <appender-ref ref="RollingFile"/>
+ </root>
+
+ <logger name="com.netflix.loadbalancer.DynamicServerListLoadBalancer" level="warn" additivity="true">
+ <appender-ref ref="RollingFile"/>
+ </logger>
+ </loggers>
+ </configuration>
linkis-env.sh: |
export LINKIS_VERSION={{ .Chart.AppVersion }}
diff --git a/linkis-dist/pom.xml b/linkis-dist/pom.xml
index 835b73f50..cf9e86996 100644
--- a/linkis-dist/pom.xml
+++ b/linkis-dist/pom.xml
@@ -189,7 +189,7 @@
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<descriptors>
- <descriptor>src/main/assembly/distribution.xml</descriptor>
+ <descriptor>distribution.xml</descriptor>
</descriptors>
</configuration>
</execution>
diff --git a/linkis-dist/src/main/assembly/distribution.xml b/linkis-dist/src/main/assembly/distribution.xml
index ba7928066..da8157874 100644
--- a/linkis-dist/src/main/assembly/distribution.xml
+++ b/linkis-dist/src/main/assembly/distribution.xml
@@ -76,6 +76,26 @@
<lineEnding>unix</lineEnding>
</fileSet>
+ <fileSet>
+ <directory>docker/</directory>
+ <outputDirectory>docker</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>helm/</directory>
+ <outputDirectory>helm</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
<fileSet>
<directory>../</directory>
<outputDirectory></outputDirectory>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org