This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-mesher.git
The following commit(s) were added to refs/heads/master by this push:
new 887389a upgrade go chassis (#127)
887389a is described below
commit 887389aa1c944b231fe9e937bae2043092b5c63b
Author: Shawn <[email protected]>
AuthorDate: Sat Sep 19 10:34:40 2020 +0800
upgrade go chassis (#127)
---
conf/chassis.yaml | 30 ++++++++++++------------------
conf/lager.yaml | 14 ++++++--------
go.mod | 5 ++---
3 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/conf/chassis.yaml b/conf/chassis.yaml
index a5a80e8..7096367 100644
--- a/conf/chassis.yaml
+++ b/conf/chassis.yaml
@@ -29,9 +29,10 @@ servicecomb:
#ex: router, ratelimiter-consumer, bizkeeper-consumer, loadbalance,
port-selector, transport
Provider:
incoming: #provider handlers
-# loadbalance:
-# strategy:
-# name: RoundRobin # Random|RoundRobin|SessionStickiness
+cse:
+ loadbalance:
+ strategy:
+ name: RoundRobin # Random|RoundRobin|SessionStickiness
# retryEnabled: false # if there is error, retry request or not
# retryOnNext: 2 # times to switch to another instance based on
strategy
# retryOnSame: 3 # times to retry on the same instance
@@ -61,21 +62,14 @@ servicecomb:
# fallbackpolicy:
# Consumer:
# policy: throwexception
-# flowcontrol:
-# Consumer: # for consumer
-# qps:
-# enabled: true # enable rate limiting or not
-# global:
-# limit: 100 # default limit of consumer
-# limit:
-# Server: 100 # rate limit for request to a provider,it represents
100 request per second
-# Provider:
-# qps:
-# enabled: true # enable rate limiting or not
-# global:
-# limit: 100 # default limit of provider
-# limit:
-# Server: 100 # rate limit for request from a provider, it
represents 100 request per second
+ flowcontrol:
+ Provider:
+ qps:
+ enabled: true # enable rate limiting or not
+ global:
+ limit: 100 # default limit of provider
+ limit:
+ Server: 100 # rate limit for request from a provider, it represents
100 request per second
#ssl:
## Set those config to make mesher as https service
diff --git a/conf/lager.yaml b/conf/lager.yaml
index 3788335..0a6b414 100644
--- a/conf/lager.yaml
+++ b/conf/lager.yaml
@@ -1,23 +1,21 @@
---
writers: file,stdout
# LoggerLevel: |DEBUG|INFO|WARN|ERROR|FATAL
-logger_level: DEBUG
+logLevel: DEBUG
# LoggerFile: used to output the name of log
-logger_file: log/mesher.log
+logFile: log/mesher.log
# LogFormatText: json/plaintext (such as log4j)，default to false
# if set logger_file and log_format_text to true, turns out log4j format log
-log_format_text: false
+logFormatText: false
-#rollingPolicy daily/size; defines rotate according to daily or size
-rollingPolicy: size
# MaxDaily of a log file before rotate. By D Days.
-log_rotate_date: 1
+logRotateAge: 1
# MaxSize of a log file before rotate. By M Bytes.
-log_rotate_size: 10
+logRotateSize: 10
# Max counts to keep of a log's backup files.
-log_backup_count: 7
\ No newline at end of file
+logBackupCount: 7
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 2a2607c..56703eb 100644
--- a/go.mod
+++ b/go.mod
@@ -4,11 +4,10 @@ require (
github.com/envoyproxy/go-control-plane
v0.9.1-0.20191026205805-5f8ba28d4473
github.com/ghodss/yaml v1.0.0
github.com/go-chassis/foundation v0.1.1-0.20200825060850-b16bf420f7b3
- github.com/go-chassis/go-archaius v1.3.3
- github.com/go-chassis/go-chassis/v2 v2.0.3-0.20200916043058-7a753c9f1471
+ github.com/go-chassis/go-archaius v1.3.6-0.20200917065837-57a2bca2b7ff
+ github.com/go-chassis/go-chassis/v2 v2.0.3-0.20200917125036-902f9f8fecd2
github.com/go-chassis/gohessian v0.0.0-20180702061429-e5130c25af55
github.com/go-chassis/openlog v1.1.2
- github.com/go-mesh/openlogging v1.0.1
github.com/gogo/googleapis v1.3.1 // indirect
github.com/gogo/protobuf v1.3.0
github.com/lyft/protoc-gen-validate v0.1.0 // indirect
