pub/nats-transport
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: extend error handling; bump: nats.go v1.13.0

Browse Source
This commit is contained in:
jar3b@outlook.com 2021-10-11 18:44:22 +03:00
parent ca5a582074
commit cbf1bd1b26
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -4,12 +4,12 @@ go 1.17
require (
github.com/golang/protobuf v1.5.2
github.com/nats-io/nats.go v1.12.3
github.com/nats-io/nats.go v1.13.0
google.golang.org/protobuf v1.27.1
)
require (
github.com/nats-io/nats-server/v2 v2.6.0 // indirect
github.com/nats-io/nats-server/v2 v2.6.1 // indirect
github.com/nats-io/nkeys v0.3.0 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect

7
go.sum
View File

@ -21,10 +21,11 @@ github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU=
github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q=
github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI=
github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY=
github.com/nats-io/nats-server/v2 v2.6.0 h1:OAt+ef+9QaaNdn4uTyQC372bv1ZZqC0vZ1I9YxWqjwI=
github.com/nats-io/nats-server/v2 v2.6.0/go.mod h1:Az91TbZiV7K4a6k/4v6YYdOKEoxCXj+iqhHVf/MlrKo=
github.com/nats-io/nats.go v1.12.3 h1:te0GLbRsjtejEkZKKiuk46tbfIn6FfCSv3WWSo1+51E=
github.com/nats-io/nats-server/v2 v2.6.1 h1:cJy+ia7/4EaJL+ZYDmIy2rD1mDWTfckhtPBU0GYo8xM=
github.com/nats-io/nats-server/v2 v2.6.1/go.mod h1:Az91TbZiV7K4a6k/4v6YYdOKEoxCXj+iqhHVf/MlrKo=
github.com/nats-io/nats.go v1.12.3/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nats.go v1.13.0 h1:LvYqRB5epIzZWQp6lmeltOOZNLqCvm4b+qfvzZO03HE=
github.com/nats-io/nats.go v1.13.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=

6
request.go
View File

@ -11,13 +11,15 @@ func (r *Request) FromHTTP(req *http.Request) error {
if req == nil {
return errors.New("nats_transport: request cannot be nil")
}
if req.Body == nil {
return errors.New("nats_transport: request body cannot be nil")
}
defer req.Body.Close()
buf, err := ioutil.ReadAll(req.Body)
if err != nil {
return fmt.Errorf("nats_transport: cannot read request body")
return fmt.Errorf("nats_transport: cannot read request body: %v", err)
}
// bufReader := ioutil.NopCloser(bytes.NewBuffer(buf))
r.Proto = req.Proto
r.Scheme = req.URL.Scheme

4
transport.go
View File

@ -46,7 +46,7 @@ func (nt NatsTransport) RoundTrip(r *http.Request) (*http.Response, error) {
// Serialize the request.
requestBytes, err := proto.Marshal(request)
if err != nil {
return nil, fmt.Errorf("nats_transport: cannot serialize request")
return nil, fmt.Errorf("nats_transport: cannot serialize request: %v", err)
}
// get the outgoing NATS subject
@ -65,7 +65,7 @@ func (nt NatsTransport) RoundTrip(r *http.Request) (*http.Response, error) {
nt.Timeout,
)
if err != nil {
return nil, fmt.Errorf("nats_transport: cannot send NATS request")
return nil, fmt.Errorf("nats_transport: cannot send NATS request: %v", err)
}
// Get Response object from NATS message