From 7b8ea79c839fb1f3a591f306571ae58c95034aee Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Wed, 20 May 2020 12:01:51 -0400 Subject: [PATCH] Update deps and fix a couple of log labels --- gateway/xgress_edge/dialer.go | 2 +- gateway/xgress_edge/listener.go | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gateway/xgress_edge/dialer.go b/gateway/xgress_edge/dialer.go index 29b436b24..15ecf21e4 100644 --- a/gateway/xgress_edge/dialer.go +++ b/gateway/xgress_edge/dialer.go @@ -58,7 +58,7 @@ func newDialer(factory *Factory, options *Options) xgress.Dialer { } func (dialer *dialer) Dial(destination string, sessionId *identity.TokenId, address xgress.Address, bindHandler xgress.BindHandler) error { - log := pfxlog.Logger().WithField("sessionId", sessionId.Token) + log := pfxlog.Logger().WithField("token", sessionId.Token) destParts := strings.Split(destination, ":") if len(destParts) != 2 { return fmt.Errorf("destination '%v' format is incorrect", destination) diff --git a/gateway/xgress_edge/listener.go b/gateway/xgress_edge/listener.go index 0c7bc27e1..74a4245d5 100644 --- a/gateway/xgress_edge/listener.go +++ b/gateway/xgress_edge/listener.go @@ -100,7 +100,7 @@ func (proxy *ingressProxy) ContentType() int32 { func (proxy *ingressProxy) processConnect(req *channel2.Message, ch channel2.Channel) { token := string(req.Body) - log := pfxlog.ContextLogger(ch.Label()).WithField("sessionId", token).WithFields(edge.GetLoggerFields(req)) + log := pfxlog.ContextLogger(ch.Label()).WithField("token", token).WithFields(edge.GetLoggerFields(req)) connId, found := req.GetUint32Header(edge.ConnIdHeader) if !found { pfxlog.Logger().Errorf("connId not set. unable to process connect message") diff --git a/go.mod b/go.mod index 3f9a705f9..fd79915c5 100644 --- a/go.mod +++ b/go.mod @@ -35,9 +35,9 @@ require ( github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc github.com/miekg/dns v1.1.22 github.com/mitchellh/mapstructure v1.1.2 - github.com/netfoundry/ziti-fabric v0.11.31 - github.com/netfoundry/ziti-foundation v0.9.17 - github.com/netfoundry/ziti-sdk-golang v0.11.33 + github.com/netfoundry/ziti-fabric v0.11.32 + github.com/netfoundry/ziti-foundation v0.10.0 + github.com/netfoundry/ziti-sdk-golang v0.11.35 github.com/oleiade/reflections v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index a560d0a36..908963930 100644 --- a/go.sum +++ b/go.sum @@ -175,12 +175,12 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/netfoundry/secretstream v0.1.1 h1:z6T7B5DuOtr9O+SmKaS9DzwOoGLYtgvyTzuPuR5FO7I= github.com/netfoundry/secretstream v0.1.1/go.mod h1:uasYkYSp0MmNSlKOWJ2sVzxPms8e58TS4ENq4yro86k= -github.com/netfoundry/ziti-fabric v0.11.31 h1:otjhKFvxBLJUDP06lHnDOsHwkvVDp3xdhKK/EQyb+Ek= -github.com/netfoundry/ziti-fabric v0.11.31/go.mod h1:OkTL8ftDbnWv9BBOGZB5cfOGUOwHz3VF9+dyxBJhHfo= -github.com/netfoundry/ziti-foundation v0.9.17 h1:cBI8oeeZLbZad4nCUe/fjad02h5es4tjbAA9qJID1Bs= -github.com/netfoundry/ziti-foundation v0.9.17/go.mod h1:s4O2kYpHcFzeMpS2hkNfD6W7Ce3RhsLw30Ruj4kBRu4= -github.com/netfoundry/ziti-sdk-golang v0.11.33 h1:QZHYmS8lpOjGwVHlkRHo4Flxs4muNJwDPTl6kI2GQsQ= -github.com/netfoundry/ziti-sdk-golang v0.11.33/go.mod h1:5NHKKY44BPh7BVCYBYpqqEHUUE8Tuaka1xJx+p0HQ90= +github.com/netfoundry/ziti-fabric v0.11.32 h1:My+U81F9NVK0Qz0wnchHw+M8A+IR/pVGU5i2uPKvJL4= +github.com/netfoundry/ziti-fabric v0.11.32/go.mod h1:NBcyAYshi4ibwLZhhk3Quok1EjLYTO+j8tmIvSKN9aM= +github.com/netfoundry/ziti-foundation v0.10.0 h1:lLtg3ADfnUaW74jnDp7vPpRlxtsBHpgITaPe54QEbnw= +github.com/netfoundry/ziti-foundation v0.10.0/go.mod h1:s4O2kYpHcFzeMpS2hkNfD6W7Ce3RhsLw30Ruj4kBRu4= +github.com/netfoundry/ziti-sdk-golang v0.11.35 h1:pFb6CN0cGjtHEEwu2DoEHt0vXs5SqKO+LIHshR8QEl4= +github.com/netfoundry/ziti-sdk-golang v0.11.35/go.mod h1:ZhRTl8s4U3jMOe2BIbpe6kFhqgtR/QJm+KoPMiDQ7Mc= github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY= github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=