Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manual update #133

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/edwarnicke/grpcfd v0.1.1
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a
github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b
github.com/networkservicemesh/sdk-k8s v0.0.0-20211202072319-42a95584fc60
github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1
github.com/networkservicemesh/sdk-k8s v0.0.0-20211214180617-38657ea11c25
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-beta.5
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
github.com/nats-io/stan.go v0.10.0/go.mod h1:0jEuBXKauB1HHJswHM/lx05K48TJ1Yxj6VIfM4k+aB4=
github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a h1:gSujYHmGiOpJyzPGZdW2ymMpmDHCMBdbUMXCVzOtrh8=
github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b h1:g0t17i2/Go2vtRrCBQoiwxskyn9QPCbvhtn9pYsVPi8=
github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
github.com/networkservicemesh/sdk-k8s v0.0.0-20211202072319-42a95584fc60 h1:WRHwQvKpeT2P+JrdkihhqC5VTp/H6cSzNkr7baAGHc0=
github.com/networkservicemesh/sdk-k8s v0.0.0-20211202072319-42a95584fc60/go.mod h1:plfYCfxj8JXSMDS9MWsN/T1LzjMMGPPtq3dHY21tH3Y=
github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1 h1:1m4QBtmYdWv3eINiCoxKHaXk0lk6rQWcefAxNOdpgiE=
github.com/networkservicemesh/sdk v0.5.1-0.20211214175953-a9c6462536d1/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
github.com/networkservicemesh/sdk-k8s v0.0.0-20211214180617-38657ea11c25 h1:9JG+uvTeXwTxLzxvqxRaqcEdOZZGC7eVI8vhFYKSrzc=
github.com/networkservicemesh/sdk-k8s v0.0.0-20211214180617-38657ea11c25/go.mod h1:WLxvB2tIClgYNXDC2nbq8/V6M/OPYV17tiQg/kUeIeM=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down
3 changes: 1 addition & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ func main() {
// setup logging
// ********************************************************************************
logrus.SetFormatter(&nested.Formatter{})
ctx = log.WithFields(ctx, map[string]interface{}{"cmd": os.Args[0]})
ctx = log.WithLog(ctx, logruslogger.New(ctx))
ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"cmd": os.Args[0]}))

logger := log.FromContext(ctx)

Expand Down