diff --git a/dubbo/config.go b/dubbo/config.go index 723d1c75fb099fa0ab6081bb1b72ceb88dfea704..8405d0522772dda6be6190810a2b0a31a6c88531 100644 --- a/dubbo/config.go +++ b/dubbo/config.go @@ -1,11 +1,11 @@ package dubbo import ( - "github.com/dubbo/dubbo-go/server" "time" ) import ( + "github.com/dubbo/dubbo-go/server" jerrors "github.com/juju/errors" ) diff --git a/dubbo/listener.go b/dubbo/listener.go index ee2c0fe991a76ca2d67a804425edeef68bef9aad..bdcebdba09fb51db019e93430391c00c3cbdc4e0 100644 --- a/dubbo/listener.go +++ b/dubbo/listener.go @@ -14,6 +14,9 @@ import ( jerrors "github.com/juju/errors" ) +// todo: WritePkg_Timeout will entry *.yml +const WritePkg_Timeout = 5*time.Second + var ( errTooManySessions = jerrors.New("too many sessions") ) @@ -280,7 +283,7 @@ func (h *RpcServerHandler) reply(session getty.Session, req *DubboPackage, tp he resp.Body = nil } - if err := session.WritePkg(resp, 10*time.Second); err != nil { + if err := session.WritePkg(resp, WritePkg_Timeout); err != nil { log.Error("WritePkg error: %#v, %#v", jerrors.Trace(err), req.Header) } } diff --git a/go.mod b/go.mod index 104d9e2ce098e1c165a3791a0b1add6c8ddc266e..612fae1560ee283cd0c3c84d06c997fc82a7a90a 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,8 @@ require ( github.com/AlexStocks/getty v0.0.0-20190331201845-1ca64ac5a589 github.com/AlexStocks/goext v0.3.2 github.com/AlexStocks/log4go v1.0.2 - github.com/dubbogo/hessian2 v0.0.0-20190331022028-ade83b794bf2 + github.com/dubbogo/hessian2 v0.0.0-20190405234732-5b4d49312622 github.com/juju/errors v0.0.0-20190207033735-e65537c515d7 - github.com/pkg/errors v0.8.1 github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 42757d365ac49aa3bcab42a9e743fda8acdbf2f3..de7f0ad6965206d4790dbaebf4748943ead5f162 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dubbogo/hessian2 v0.0.0-20190331022028-ade83b794bf2 h1:5kv4/4ptZTNcG2dzfHqXPiBHZcPPR3jshgxpHvlidew= -github.com/dubbogo/hessian2 v0.0.0-20190331022028-ade83b794bf2/go.mod h1:v+gfInE8fm/k3Fjkb2oUCKSO9LKbWvf+PtweEI89BmI= +github.com/dubbogo/hessian2 v0.0.0-20190405234732-5b4d49312622 h1:jZgBUBFsuIsqvrVCXwDKpSdeYyqnnZU6ABBNNPWdVFo= +github.com/dubbogo/hessian2 v0.0.0-20190405234732-5b4d49312622/go.mod h1:v+gfInE8fm/k3Fjkb2oUCKSO9LKbWvf+PtweEI89BmI= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=