[servicecomb-service-center] branch v1.x updated: bump verion of gorilla/websocket (#881)
This is an automated email from the ASF dual-hosted git repository. tianxiaoliang pushed a commit to branch v1.x in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git The following commit(s) were added to refs/heads/v1.x by this push: new d6531d8 bump verion of gorilla/websocket (#881) d6531d8 is described below commit d6531d801ecb64754d7f30e6b1ca504f7c2b54b7 Author: Shawn AuthorDate: Thu Mar 4 12:04:50 2021 +0800 bump verion of gorilla/websocket (#881) --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 76f2622..6099b9d 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-chassis/paas-lager v1.1.1 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d github.com/golang/protobuf v1.3.2 - github.com/gorilla/websocket v1.4.0 + github.com/gorilla/websocket v1.4.2 github.com/hashicorp/serf v0.8.3 github.com/karlseguin/ccache v2.0.3-0.20170217060820-3ba9789cfd2c+incompatible github.com/labstack/echo v3.2.2-0.20180316170059-a5d81b8d4a62+incompatible
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #881: bump verion of gorilla/websocket
tianxiaoliang merged pull request #881: URL: https://github.com/apache/servicecomb-service-center/pull/881 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang opened a new pull request #881: bump verion of gorilla/websocket
tianxiaoliang opened a new pull request #881: URL: https://github.com/apache/servicecomb-service-center/pull/881 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). - [ ] Never comment source code, delete it. - [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run(). --- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch v1.x updated: change brute force password retry time to 3 (#880)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 651c362 change brute force password retry time to 3 (#880)
651c362 is described below
commit 651c36298e000643ebd1e000162ca3c794c5761b
Author: Shawn
AuthorDate: Thu Mar 4 11:36:21 2021 +0800
change brute force password retry time to 3 (#880)
# Conflicts:
# go.mod
---
server/service/rbac/blocker.go | 2 +-
server/service/rbac/blocker_test.go | 18 --
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/server/service/rbac/blocker.go b/server/service/rbac/blocker.go
index 8d94b46..265e4dd 100644
--- a/server/service/rbac/blocker.go
+++ b/server/service/rbac/blocker.go
@@ -25,7 +25,7 @@ import (
)
const (
- MaxAttempts = 5
+ MaxAttempts = 2
BlockInterval = 1 * time.Hour
)
diff --git a/server/service/rbac/blocker_test.go
b/server/service/rbac/blocker_test.go
index 6e77746..ce27b68 100644
--- a/server/service/rbac/blocker_test.go
+++ b/server/service/rbac/blocker_test.go
@@ -33,15 +33,6 @@ func TestCountFailure(t *testing.T) {
assert.False(t, rbac.IsBanned("1"))
rbac.CountFailure("1")
- assert.False(t, rbac.IsBanned("1"))
-
- rbac.CountFailure("1")
- assert.False(t, rbac.IsBanned("1"))
-
- rbac.CountFailure("1")
- assert.False(t, rbac.IsBanned("1"))
-
- rbac.CountFailure("1")
assert.True(t, rbac.IsBanned("1"))
t.Run("ban 1 more", func(t *testing.T) {
@@ -52,15 +43,6 @@ func TestCountFailure(t *testing.T) {
assert.False(t, rbac.IsBanned("2"))
rbac.CountFailure("2")
- assert.False(t, rbac.IsBanned("2"))
-
- rbac.CountFailure("2")
- assert.False(t, rbac.IsBanned("2"))
-
- rbac.CountFailure("2")
- assert.False(t, rbac.IsBanned("2"))
-
- rbac.CountFailure("2")
assert.True(t, rbac.IsBanned("2"))
})
t.Log(rbac.BannedList()[0].ReleaseAt)
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #880: change brute force password retry time to 3
tianxiaoliang merged pull request #880: URL: https://github.com/apache/servicecomb-service-center/pull/880 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Hoysun opened a new issue #2274: provider指定服务限流策略从全局配置删除时，provider抛出异常，后续consumer请求全部异常
Hoysun opened a new issue #2274:
URL: https://github.com/apache/servicecomb-java-chassis/issues/2274
consumer handler：
handler:
chain:
Consumer:
default:
loadbalance,bizkeeper-consumer,qps-flowcontrol-consumer,fault-injection-consumer,governance-consumer
provider handler：
handler:
chain:
Provider:
default: qps-flowcontrol-provider,governance-provider
连接一代引擎：
servicecomb:
codec:
printErrorMessage: true
service:
registry:
address: ${sc}
config:
client:
serverUri: ${cc}
refreshMode: 1
refresh_interval: 1000
ignoreResolveFailure: true
console界面全局配置下发指定服务的限流策略：
servicecomb.flowcontrol.Provider.qps.limit.XXX：1
consumer请求provider限流正常触发
console直接删除上面的全局配置
provider直接报出异常
2021-03-04 11:18:54,418 [INFO] Qps limit updated, configKey =
[AutoConsumer], value = [null]
org.apache.servicecomb.qps.QpsControllerManager.lambda$createQpsControllerIfNotExist$2(QpsControllerManager.java:188)
2021-03-04 11:18:54,421 [ERROR] Error in DynamicProperty callback
com.netflix.config.DynamicProperty.notifyCallbacks(DynamicProperty.java:528)
java.lang.NullPointerException
at
java.util.concurrent.ConcurrentHashMap$MapEntry.setValue(ConcurrentHashMap.java:3500)
at
org.apache.servicecomb.qps.QpsControllerManager.updateObjMap(QpsControllerManager.java:207)
at
org.apache.servicecomb.qps.QpsControllerManager.lambda$createQpsControllerIfNotExist$2(QpsControllerManager.java:190)
at
com.netflix.config.DynamicProperty.notifyCallbacks(DynamicProperty.java:526)
at
com.netflix.config.DynamicProperty.updateProperty(DynamicProperty.java:591)
at
com.netflix.config.DynamicProperty.access$600(DynamicProperty.java:59)
at
com.netflix.config.DynamicProperty$DynamicPropertyListener.clearProperty(DynamicProperty.java:647)
at
com.netflix.config.ExpandedConfigurationListenerAdapter.configurationChanged(ExpandedConfigurationListenerAdapter.java:119)
at
com.netflix.config.ConcurrentMapConfiguration.fireEvent(ConcurrentMapConfiguration.java:312)
at
com.netflix.config.ConcurrentCompositeConfiguration$1.configurationChanged(ConcurrentCompositeConfiguration.java:160)
at
com.netflix.config.ConcurrentMapConfiguration.fireEvent(ConcurrentMapConfiguration.java:312)
at
org.apache.commons.configuration.AbstractConfiguration.clearProperty(AbstractConfiguration.java:506)
at
com.netflix.config.DynamicPropertyUpdater.deleteProperty(DynamicPropertyUpdater.java:169)
at
com.netflix.config.DynamicPropertyUpdater.updateProperties(DynamicPropertyUpdater.java:104)
at
com.netflix.config.DynamicWatchedConfiguration.updateConfiguration(DynamicWatchedConfiguration.java:83)
at
org.apache.servicecomb.config.archaius.sources.ConfigCenterConfigurationSourceImpl.updateConfiguration(ConfigCenterConfigurationSourceImpl.java:107)
at
org.apache.servicecomb.config.archaius.sources.ConfigCenterConfigurationSourceImpl.access$100(ConfigCenterConfigurationSourceImpl.java:45)
at
org.apache.servicecomb.config.archaius.sources.ConfigCenterConfigurationSourceImpl$UpdateHandler.handle(ConfigCenterConfigurationSourceImpl.java:141)
at
org.apache.servicecomb.config.client.ParseConfigUtils.notifyItemsChangedNeedRefresh(ParseConfigUtils.java:164)
at
org.apache.servicecomb.config.client.ParseConfigUtils.doRefreshItems(ParseConfigUtils.java:130)
at
org.apache.servicecomb.config.client.ParseConfigUtils.refreshConfigItems(ParseConfigUtils.java:89)
at
org.apache.servicecomb.config.client.ConfigCenterClient$ConfigRefresh.lambda$null$7(ConfigCenterClient.java:326)
at
io.vertx.core.http.impl.HttpClientResponseImpl$BodyHandler.notifyHandler(HttpClientResponseImpl.java:292)
at
io.vertx.core.http.impl.HttpClientResponseImpl.lambda$bodyHandler$0(HttpClientResponseImpl.java:193)
at
io.vertx.core.http.impl.HttpClientResponseImpl.handleEnd(HttpClientResponseImpl.java:248)
at
io.vertx.core.http.impl.Http1xClientConnection$StreamImpl.lambda$beginResponse$0(Http1xClientConnection.java:483)
at
io.vertx.core.streams.impl.InboundBuffer.handleEvent(InboundBuffer.java:237)
at
io.vertx.core.streams.impl.InboundBuffer.write(InboundBuffer.java:127)
at
io.vertx.core.http.impl.Http1xClientConnection$StreamImpl.endResponse(Http1xClientConnection.java:502)
at
io.vertx.core.http.impl.Http1xClientConnection$StreamImpl.access$000(Http1xClientConnection.java:241)
at
io.vertx.core.http.impl.Http1xClientConnection.handleResponseEnd(Http1xClientConnection.java:641)
at
io.vertx.core.http.impl.Http1xClientConnection.handleHttpMessage(Http1xClientConnection.java:601)
at
[GitHub] [servicecomb-service-center] tianxiaoliang opened a new pull request #880: change brute force password retry time to 3
tianxiaoliang opened a new pull request #880: URL: https://github.com/apache/servicecomb-service-center/pull/880 # Conflicts: #go.mod Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). - [ ] Never comment source code, delete it. - [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run(). --- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Hoysun commented on issue #2272: 如何获取微服务名
Hoysun commented on issue #2272: URL: https://github.com/apache/servicecomb-java-chassis/issues/2272#issuecomment-790228852  https://docs.servicecomb.io/java-chassis/zh_CN/registry/introduction/ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Hoysun closed issue #2273: 2.1.6版本每次请求都会打印一次日志，建议优化关闭
Hoysun closed issue #2273: URL: https://github.com/apache/servicecomb-java-chassis/issues/2273 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] Hoysun opened a new issue #2273: 2.1.6版本每次请求都会打印一次日志，建议优化关闭
Hoysun opened a new issue #2273: URL: https://github.com/apache/servicecomb-java-chassis/issues/2273  2021-03-04 09:56:01,110 [INFO] Found SPI service org.apache.servicecomb.router.custom.RouterHeaderFilterExt, count=0. org.apache.servicecomb.foundation.common.utils.SPIServiceUtils.loadSortedService(SPIServiceUtils.java:79) 2021-03-04 09:56:03,764 [INFO] Found SPI service org.apache.servicecomb.router.custom.RouterHeaderFilterExt, count=0. org.apache.servicecomb.foundation.common.utils.SPIServiceUtils.loadSortedService(SPIServiceUtils.java:79) 2021-03-04 09:56:07,234 [INFO] Found SPI service org.apache.servicecomb.router.custom.RouterHeaderFilterExt, count=0. org.apache.servicecomb.foundation.common.utils.SPIServiceUtils.loadSortedService(SPIServiceUtils.java:79) 2021-03-04 09:56:09,716 [INFO] Found SPI service org.apache.servicecomb.router.custom.RouterHeaderFilterExt, count=0. org.apache.servicecomb.foundation.common.utils.SPIServiceUtils.loadSortedService(SPIServiceUtils.java:79) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] coveralls edited a comment on pull request #703: WIP: [SCB-2205] Polishing Github actions workflow
coveralls edited a comment on pull request #703: URL: https://github.com/apache/servicecomb-pack/pull/703#issuecomment-789791427 [](https://coveralls.io/builds/37636693) Coverage remained the same at 80.698% when pulling **4f01281ccf019a86299283ddefeed4bb334da01c on coolbeevip:SCB-2205** into **6033905e3d71ea4586dbbd75c418c50fd5bd2638 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] coolbeevip closed pull request #703: WIP: [SCB-2205] Polishing Github actions workflow
coolbeevip closed pull request #703: URL: https://github.com/apache/servicecomb-pack/pull/703 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] coveralls edited a comment on pull request #703: WIP: [SCB-2205] Polishing Github actions workflow
coveralls edited a comment on pull request #703: URL: https://github.com/apache/servicecomb-pack/pull/703#issuecomment-789791427 [](https://coveralls.io/builds/37623351) Coverage decreased (-0.04%) to 80.656% when pulling **4f01281ccf019a86299283ddefeed4bb334da01c on coolbeevip:SCB-2205** into **6033905e3d71ea4586dbbd75c418c50fd5bd2638 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] coveralls edited a comment on pull request #703: WIP: [SCB-2205] Polishing Github actions workflow
coveralls edited a comment on pull request #703: URL: https://github.com/apache/servicecomb-pack/pull/703#issuecomment-789791427 [](https://coveralls.io/builds/37619930) Coverage remained the same at 80.698% when pulling **fde5f1d546c595538f6ba0c5d5ca8d4665482db9 on coolbeevip:SCB-2205** into **6033905e3d71ea4586dbbd75c418c50fd5bd2638 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] coveralls commented on pull request #703: WIP: [SCB-2205] Polishing Github actions workflow
coveralls commented on pull request #703: URL: https://github.com/apache/servicecomb-pack/pull/703#issuecomment-789791427 [](https://coveralls.io/builds/37618848) Coverage decreased (-0.02%) to 80.677% when pulling **ddadcce8d3c934c383e036e9b5aa152da6a1b3cd on coolbeevip:SCB-2205** into **6033905e3d71ea4586dbbd75c418c50fd5bd2638 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] coolbeevip opened a new pull request #703: WIP: [SCB-2205] Fix pull request and push trigger condition
coolbeevip opened a new pull request #703: URL: https://github.com/apache/servicecomb-pack/pull/703 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] WillemJiang commented on issue #693: migrate travis-ci to github workflow
WillemJiang commented on issue #693: URL: https://github.com/apache/servicecomb-pack/issues/693#issuecomment-789585787 Now we just switch to GithubAction. It's time to consider to remove the travis setting now. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-pack] WillemJiang merged pull request #702: [SCB-2204] Fix acceptance test for an Interim fix only for CI to pass
WillemJiang merged pull request #702: URL: https://github.com/apache/servicecomb-pack/pull/702 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-pack] branch master updated: SCB-2204 Try fix test case
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git The following commit(s) were added to refs/heads/master by this push: new 6033905 SCB-2204 Try fix test case 6033905 is described below commit 6033905e3d71ea4586dbbd75c418c50fd5bd2638 Author: zhanglei AuthorDate: Wed Mar 3 15:14:23 2021 +0800 SCB-2204 Try fix test case --- .../src/test/resources/alpha_records_transaction_events.feature| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature index 4f0aa48..af02262 100644 --- a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature +++ b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature @@ -185,11 +185,10 @@ Feature: Alpha records transaction events | booking | SagaAbortedEvent | | car | TxCompensateAckFailedEvent | | car | TxCompensateAckFailedEvent | - | car | TxCompensateAckFailedEvent | Then Car Service contains the following booking orders | id | name | amount | confirmed | cancelled | | 1 | Sean | 5 | true | false | Then Hotel Service contains the following booking orders - | id | name | amount | confirmed | cancelled | \ No newline at end of file + | id | name | amount | confirmed | cancelled |
[servicecomb-pack] branch master updated (5682839 -> 0ce009a)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from 5682839 SCB-2203 Remove SonarScanner add 0ce009a SCB-2202 Improve ForwardRecoveryTest.throwExceptionWhenRetryReachesMaximum No new revisions were added by this update. Summary of changes: .../pack/omega/transaction/ForwardRecoveryTest.java | 13 + 1 file changed, 9 insertions(+), 4 deletions(-)
[GitHub] [servicecomb-pack] WillemJiang merged pull request #701: [SCB-2202] Improve ForwardRecoveryTest.throwExceptionWhenRetryReachesMaximum
WillemJiang merged pull request #701: URL: https://github.com/apache/servicecomb-pack/pull/701 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] tiger-super opened a new issue #2272: 如何获取微服务名
tiger-super opened a new issue #2272: URL: https://github.com/apache/servicecomb-java-chassis/issues/2272 有没有类可以在业务代码里面直接获得微服务名、微服务版本等微服务信息 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] tiger-super commented on issue #2267: 异常信息带不带'符号问题
tiger-super commented on issue #2267: URL: https://github.com/apache/servicecomb-java-chassis/issues/2267#issuecomment-789545313 > 看起来 consumer 的结果是 CommonExceptionData.toString 的值。 看现在情况是provider抛出的异常consumer是拦截不到，只能再配置一个handler去拦截 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #877: [SCB-2094] Bugfix-the printing information of relevant logs is not clear
tianxiaoliang merged pull request #877: URL: https://github.com/apache/servicecomb-service-center/pull/877 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: [SCB-2094] Bugfix-the printing information of relevant logs is not clear (#877)
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-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new bd28b1e [SCB-2094] Bugfix-the printing information of relevant logs
is not clear (#877)
bd28b1e is described below
commit bd28b1e72b245bae5aa1025eab2200ace81e7b13
Author: robotLJW <790504...@qq.com>
AuthorDate: Wed Mar 3 16:29:58 2021 +0800
[SCB-2094] Bugfix-the printing information of relevant logs is not clear
(#877)
---
datasource/mongo/ms.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/datasource/mongo/ms.go b/datasource/mongo/ms.go
index a2732ac..a049c8b 100644
--- a/datasource/mongo/ms.go
+++ b/datasource/mongo/ms.go
@@ -1634,7 +1634,7 @@ func (ds *DataSource) GetInstance(ctx context.Context,
request *discovery.GetOne
serviceIDs = filterServiceIDs(ctx, request.ConsumerServiceId,
request.Tags, services)
if len(serviceIDs) == 0 {
mes := fmt.Errorf("%s failed, provider instance does not
exist", findFlag())
- log.Error("get instance failed", err)
+ log.Error("query service failed", mes)
return {
Response:
discovery.CreateResponse(discovery.ErrInstanceNotExists, mes.Error()),
}, nil
@@ -1659,7 +1659,7 @@ func (ds *DataSource) GetInstance(ctx context.Context,
request *discovery.GetOne
}
if !isExist {
mes := fmt.Errorf("%s failed, provider instance does
not exist", findFlag())
- log.Error("get instance failed", err)
+ log.Error("get instance failed", mes)
return {
Response:
discovery.CreateResponse(discovery.ErrInstanceNotExists, mes.Error()),
}, nil
@@ -1729,7 +1729,7 @@ func (ds *DataSource) GetInstances(ctx context.Context,
request *discovery.GetIn
serviceIDs := filterServiceIDs(ctx, request.ConsumerServiceId,
request.Tags, []*Service{provider})
if len(serviceIDs) == 0 {
mes := fmt.Errorf("%s failed, provider does not exist",
findFlag())
- log.Error("get instances failed", mes)
+ log.Error("query service failed", mes)
return {
Response:
discovery.CreateResponse(discovery.ErrServiceNotExists, mes.Error()),
}, nil
[GitHub] [servicecomb-pack] coolbeevip commented on pull request #702: WIP: [SCB-2204] Try fix test case
coolbeevip commented on pull request #702: URL: https://github.com/apache/servicecomb-pack/pull/702#issuecomment-789523965 Fix `alpha_records_transaction_events.feature` for an Interim fix only for CI to pass and later trace https://issues.apache.org/jira/browse/SCB-2204 to compensate for the failure count problem This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
