This is an automated email from the ASF dual-hosted git repository.
hefengen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 951cfb886 [type:optimize] optimize shenyu parameters (#4556)
951cfb886 is described below
commit 951cfb886e034aede887f25907304ef84b128645
Author: moremind <[email protected]>
AuthorDate: Sat Apr 15 00:48:58 2023 +0800
[type:optimize] optimize shenyu parameters (#4556)
* optimize parameter
* optimize parameter
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
* optimize pom
---
shenyu-bootstrap/pom.xml | 4 ++++
shenyu-bootstrap/src/main/resources/logback.xml | 6 +++---
shenyu-client/shenyu-client-sofa/pom.xml | 14 +++++++++++++-
.../shenyu-bootstrap-dist/src/main/resources/logback.xml | 6 +++---
.../shenyu-examples-sofa-service/pom.xml | 6 ++++++
.../shenyu-integrated-test-combination/pom.xml | 4 ++++
.../shenyu-integrated-test-sofa/pom.xml | 4 ++++
shenyu-plugin/shenyu-plugin-sofa/pom.xml | 16 ++++++++++++++++
.../shenyu-spring-boot-starter-plugin-sofa/pom.xml | 6 ++++++
9 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index db705e664..135a3f805 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -241,6 +241,10 @@
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/shenyu-bootstrap/src/main/resources/logback.xml
b/shenyu-bootstrap/src/main/resources/logback.xml
index e18deea68..eef8d3a4c 100644
--- a/shenyu-bootstrap/src/main/resources/logback.xml
+++ b/shenyu-bootstrap/src/main/resources/logback.xml
@@ -25,7 +25,7 @@
<property name="MAX_LOG_FILE_HISTORY"
value="${log.max-log-file-history:-7}"/>
<property name="LOG_FILE_TOTAL_CAPACITY"
value="${log.log-file-total-capacity:-10GB}"/>
<property name="ASYNC_DISCARDING_THRESHOLD"
value="${log.async.discarding-threshold:-0}"/>
- <property name="ASYNC_LOG_QUEUE_SIZE"
value="${log.async.queue-size:-256}"/>
+ <property name="ASYNC_LOG_QUEUE_SIZE"
value="${log.async.queue-size:-512}"/>
<property name="LOG_PATTERN" value="%red(%d{yyyy-MM-dd HH:mm:ss})
%green([%thread]) %highlight(%-5level) %boldMagenta(%logger) - %cyan(%msg%n)"/>
@@ -38,7 +38,7 @@
<appender name="ASYNC_STDOUT" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>${ASYNC_DISCARDING_THRESHOLD}</discardingThreshold>
<queueSize>${ASYNC_LOG_QUEUE_SIZE}</queueSize>
- <includeCallerData>true</includeCallerData>
+ <includeCallerData>false</includeCallerData>
<appender-ref ref="STDOUT"/>
</appender>
@@ -84,7 +84,7 @@
<appender name="ASYNC_ERROR_FILE"
class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>${ASYNC_DISCARDING_THRESHOLD}</discardingThreshold>
<queueSize>${ASYNC_LOG_QUEUE_SIZE}</queueSize>
- <includeCallerData>true</includeCallerData>
+ <includeCallerData>false</includeCallerData>
<appender-ref ref="ERROR_FILE"/>
</appender>
diff --git a/shenyu-client/shenyu-client-sofa/pom.xml
b/shenyu-client/shenyu-client-sofa/pom.xml
index 30ea0b16e..bf9f2eadf 100644
--- a/shenyu-client/shenyu-client-sofa/pom.xml
+++ b/shenyu-client/shenyu-client-sofa/pom.xml
@@ -26,7 +26,8 @@
<artifactId>shenyu-client-sofa</artifactId>
<properties>
-
<runtime-sofa-boot-starter.version>3.1.4</runtime-sofa-boot-starter.version>
+
<runtime-sofa-boot-starter.version>3.1.4</runtime-sofa-boot-starter.version>
+ <grpc-core.version>1.28.1</grpc-core.version>
</properties>
<dependencies>
@@ -45,6 +46,17 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc-core.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
index 146806703..d12950f7c 100644
--- a/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
+++ b/shenyu-dist/shenyu-bootstrap-dist/src/main/resources/logback.xml
@@ -26,7 +26,7 @@
<property name="MAX_LOG_FILE_HISTORY"
value="${log.max-log-file-history:-7}"/>
<property name="LOG_FILE_TOTAL_CAPACITY"
value="${log.log-file-total-capacity:-10GB}"/>
<property name="ASYNC_DISCARDING_THRESHOLD"
value="${log.async.discarding-threshold:-0}"/>
- <property name="ASYNC_LOG_QUEUE_SIZE"
value="${log.async.queue-size:-256}"/>
+ <property name="ASYNC_LOG_QUEUE_SIZE"
value="${log.async.queue-size:-512}"/>
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss} [%thread]
%-5level %logger - %msg%n"/>
@@ -47,7 +47,7 @@
<appender name="ASYNC_FILE" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>${ASYNC_DISCARDING_THRESHOLD}</discardingThreshold>
<queueSize>${ASYNC_LOG_QUEUE_SIZE}</queueSize>
- <includeCallerData>true</includeCallerData>
+ <includeCallerData>false</includeCallerData>
<appender-ref ref="FILE"/>
</appender>
@@ -72,7 +72,7 @@
<appender name="ASYNC_ERROR_FILE"
class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>${ASYNC_DISCARDING_THRESHOLD}</discardingThreshold>
<queueSize>${ASYNC_LOG_QUEUE_SIZE}</queueSize>
- <includeCallerData>true</includeCallerData>
+ <includeCallerData>false</includeCallerData>
<appender-ref ref="ERROR_FILE"/>
</appender>
diff --git
a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
index 51ff2a63c..9d9e2c2e6 100644
--- a/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
+++ b/shenyu-examples/shenyu-examples-sofa/shenyu-examples-sofa-service/pom.xml
@@ -50,6 +50,12 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>rpc-sofa-boot-starter</artifactId>
<version>${rpc-sofa-boot-starter.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- <dependency>-->
diff --git a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
index 224bd5a94..1ea26c4b2 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-combination/pom.xml
@@ -162,6 +162,10 @@
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
index dd22ba9d7..1b2160686 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sofa/pom.xml
@@ -42,6 +42,10 @@
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/shenyu-plugin/shenyu-plugin-sofa/pom.xml
b/shenyu-plugin/shenyu-plugin-sofa/pom.xml
index 075af7130..d9ee4fd8f 100644
--- a/shenyu-plugin/shenyu-plugin-sofa/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-sofa/pom.xml
@@ -25,6 +25,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-plugin-sofa</artifactId>
+ <properties>
+ <grpc-core.version>1.28.1</grpc-core.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
@@ -36,6 +40,18 @@
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ <version>${grpc-core.version}</version>
</dependency>
<dependency>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/pom.xml
index 5e014aefe..8593508aa 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/pom.xml
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-sofa/pom.xml
@@ -48,6 +48,12 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-core</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
</dependencies>
