Skip to content

Commit

Permalink
txn: fix klogr output
Browse files Browse the repository at this point in the history
  • Loading branch information
hunchback authored and OmerBenHayun committed Jun 9, 2021
1 parent dd0a75b commit 0a32b6c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion go.mod
Expand Up @@ -23,7 +23,6 @@ require (
go.uber.org/zap v1.17.0 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc // indirect
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.6.0
)

Expand Down
3 changes: 0 additions & 3 deletions go.sum
Expand Up @@ -70,7 +70,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
Expand Down Expand Up @@ -486,8 +485,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.6.0 h1:c1wFxejFMBkp/VxCdc6kYdgrBkC2gzmcl6afuJAkJyU=
k8s.io/klog/v2 v2.6.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
4 changes: 2 additions & 2 deletions pkg/ovsdb/transact.go
Expand Up @@ -15,7 +15,7 @@ import (
"go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/mvccpb"
clientv3 "go.etcd.io/etcd/client/v3"
"k8s.io/klog/klogr"
"k8s.io/klog/v2/klogr"

"github.com/ibm/ovsdb-etcd/pkg/common"
"github.com/ibm/ovsdb-etcd/pkg/libovsdb"
Expand Down Expand Up @@ -545,7 +545,7 @@ type Transaction struct {
func NewTransaction(cli *clientv3.Client, request *libovsdb.Transact) *Transaction {
txn := new(Transaction)
txn.txnid = shortuuid.New()
txn.log = klogr.New().WithValues("txnid", txn.txnid)
txn.log = klogr.NewWithOptions().WithValues("txnid", txn.txnid)
txn.log.Info("new transaction", "size", len(request.Operations), "request", request)
txn.cache = Cache{}
txn.mapUUID = MapUUID{}
Expand Down

0 comments on commit 0a32b6c

Please sign in to comment.