You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/01/05 07:38:55 UTC
[dubbo-go] branch develop updated (b8968e5 -> 838c847)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.
discard b8968e5 Merge pull request #983 from yakecanlee/feature/fix-client-timeout-error-message
new 838c847 Merge pull request #983 from yakecanlee/feature/fix-client-timeout-error-message
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b8968e5)
\
N -- N -- N refs/heads/develop (838c847)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[dubbo-go] 01/01: Merge pull request #983 from
yakecanlee/feature/fix-client-timeout-error-message
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 838c8473a6d86e465da8d8ae310ebcbd32eba18c
Merge: ded3c49 96a6c30
Author: Xin.Zh <dr...@foxmail.com>
AuthorDate: Tue Jan 5 13:19:37 2021 +0800
Merge pull request #983 from yakecanlee/feature/fix-client-timeout-error-message
Fix: change client error message of issue #972
.travis.yml | 2 +-
registry/kubernetes/registry.go | 5 -----
remoting/getty/getty_client.go | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --cc .travis.yml
index 4f79ecf,4f79ecf..fb95813
--- a/.travis.yml
+++ b/.travis.yml
@@@ -15,7 -15,7 +15,7 @@@ install: tru
# define ci-stage
script:
-- - go fmt ./... && [[ -z `git status -s` ]]
++ - go fmt ./... && git checkout -- go.mod && [[ -z `git status -s` ]]
# license-check
- make verify
# integrate-test
diff --cc registry/kubernetes/registry.go
index 55be4c3,55be4c3..c4a0352
--- a/registry/kubernetes/registry.go
+++ b/registry/kubernetes/registry.go
@@@ -39,11 -39,11 +39,6 @@@ import
"github.com/apache/dubbo-go/remoting/kubernetes"
)
--//var (
--// processID = ""
--// localIP = ""
--//)
--
const (
Name = "kubernetes"
ConnDelay = 3
diff --cc remoting/getty/getty_client.go
index 7ae0317,156d648..57221cc
--- a/remoting/getty/getty_client.go
+++ b/remoting/getty/getty_client.go
@@@ -38,12 -38,12 +38,12 @@@ import
)
var (
- errSessionNotExist = perrors.New("session not exist")
- errClientClosed = perrors.New("client closed")
- errClientReadTimeoutOrDecoedFail = perrors.New("maybe the client read timeout or fail to decode tcp stream in Writer.Write")
+ errSessionNotExist = perrors.New("session not exist")
+ errClientClosed = perrors.New("client closed")
- errClientReadTimeout = perrors.New("client read timeout")
++ errClientReadTimeout = perrors.New("maybe the client read timeout or fail to decode tcp stream in Writer.Write")
clientConf *ClientConfig
- clientGrpool *gxsync.TaskPool
+ clientGrpool gxsync.GenericTaskPool
)
// it is init client for single protocol.