Skip to content
Snippets Groups Projects
Commit 34968e69 authored by 382673304@qq.com's avatar 382673304@qq.com
Browse files

chore: change time.After usage

parent 44c504cc
No related branches found
No related tags found
No related merge requests found
......@@ -883,6 +883,7 @@ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLy
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
......
......@@ -240,7 +240,7 @@ func (g *dubboGrpc) generateClientSignature(servName string, method *pb.MethodDe
}
respName := "out *" + g.typeName(method.GetOutputType())
if method.GetServerStreaming() || method.GetClientStreaming() {
respName = servName + "_" + generator.CamelCase(origMethName) + "Client"
respName = "out * "+ servName + "_" + generator.CamelCase(origMethName) + "Client"
}
return fmt.Sprintf("%s func(ctx %s.Context%s, %s) error", methName, contextPkg, reqArg, respName)
}
......
......@@ -37,7 +37,7 @@ import (
const (
registryConnDelay = 3
registryDestroyDefaultTimeout = time.Second
registryDestroyDefaultTimeout = time.Second * 3
)
func init() {
......@@ -69,10 +69,9 @@ func newConsulRegistry(url *common.URL) (registry.Registry, error) {
}
r := &consulRegistry{
URL: url,
client: client,
done: make(chan struct{}),
timeOut: registryDestroyDefaultTimeout,
URL: url,
client: client,
done: make(chan struct{}),
}
return r, nil
......@@ -194,7 +193,6 @@ func (r *consulRegistry) IsAvailable() bool {
func (r *consulRegistry) Destroy() {
if r.URL != nil {
done := make(chan struct{}, 1)
ticker := time.After(r.timeOut)
go func() {
defer func() {
if e := recover(); e != nil {
......@@ -209,7 +207,7 @@ func (r *consulRegistry) Destroy() {
select {
case <-done:
logger.Infof("consulRegistry unregister done")
case <-ticker:
case <-time.After(registryDestroyDefaultTimeout):
logger.Errorf("consul unregister timeout")
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment