From e16cba6165f384ba1bc66e3097f260a52cc99ebe Mon Sep 17 00:00:00 2001 From: chris erway Date: Fri, 14 Jun 2024 14:05:34 -0400 Subject: [PATCH] Upgrade to go-log v2.5.1 --- crawler/crawler.go | 2 +- dht.go | 2 +- fullrt/dht.go | 2 +- go.mod | 4 ++-- internal/net/message_manager.go | 2 +- netsize/netsize.go | 2 +- pb/message.go | 2 +- pb/protocol_messenger.go | 2 +- providers/providers_manager.go | 2 +- rtrefresh/rt_refresh_manager.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crawler/crawler.go b/crawler/crawler.go index 965f1df2f..e055c5414 100644 --- a/crawler/crawler.go +++ b/crawler/crawler.go @@ -10,7 +10,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/protocol" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" //lint:ignore SA1019 TODO migrate away from gogo pb "github.com/libp2p/go-msgio/protoio" diff --git a/dht.go b/dht.go index 175b20f34..f7ac66d96 100644 --- a/dht.go +++ b/dht.go @@ -33,7 +33,7 @@ import ( "github.com/gogo/protobuf/proto" ds "github.com/ipfs/go-datastore" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/multiformats/go-base32" ma "github.com/multiformats/go-multiaddr" "go.opencensus.io/tag" diff --git a/fullrt/dht.go b/fullrt/dht.go index 99d1c3eb2..2242fbf6d 100644 --- a/fullrt/dht.go +++ b/fullrt/dht.go @@ -28,7 +28,7 @@ import ( "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" dssync "github.com/ipfs/go-datastore/sync" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" kaddht "github.com/libp2p/go-libp2p-kad-dht" "github.com/libp2p/go-libp2p-kad-dht/crawler" diff --git a/go.mod b/go.mod index 68d6103f7..b53f43916 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/ipfs/go-cid v0.4.1 github.com/ipfs/go-datastore v0.6.0 github.com/ipfs/go-detect-race v0.0.1 - github.com/ipfs/go-log v1.0.5 + github.com/ipfs/go-log/v2 v2.5.1 github.com/libp2p/go-libp2p v0.30.0 github.com/libp2p/go-libp2p-kbucket v0.6.3 github.com/libp2p/go-libp2p-record v0.2.0 @@ -62,7 +62,7 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/huin/goupnp v1.2.0 // indirect - github.com/ipfs/go-log/v2 v2.5.1 // indirect + github.com/ipfs/go-log v1.0.5 // indirect github.com/ipld/go-ipld-prime v0.20.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect diff --git a/internal/net/message_manager.go b/internal/net/message_manager.go index c26b5eefe..294425f76 100644 --- a/internal/net/message_manager.go +++ b/internal/net/message_manager.go @@ -13,7 +13,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/protocol" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-msgio" //lint:ignore SA1019 TODO migrate away from gogo pb diff --git a/netsize/netsize.go b/netsize/netsize.go index 669081e8c..02a0e6789 100644 --- a/netsize/netsize.go +++ b/netsize/netsize.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" kbucket "github.com/libp2p/go-libp2p-kbucket" "github.com/libp2p/go-libp2p/core/peer" ks "github.com/whyrusleeping/go-keyspace" diff --git a/pb/message.go b/pb/message.go index 49f52ade6..2e4f3d665 100644 --- a/pb/message.go +++ b/pb/message.go @@ -4,7 +4,7 @@ import ( "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pb/protocol_messenger.go b/pb/protocol_messenger.go index cc1fcfff4..7971db68e 100644 --- a/pb/protocol_messenger.go +++ b/pb/protocol_messenger.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" recpb "github.com/libp2p/go-libp2p-record/pb" "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/peer" diff --git a/providers/providers_manager.go b/providers/providers_manager.go index b7f1d7d90..1400dc76c 100644 --- a/providers/providers_manager.go +++ b/providers/providers_manager.go @@ -13,7 +13,7 @@ import ( ds "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/autobatch" dsq "github.com/ipfs/go-datastore/query" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-kad-dht/internal" "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/peerstore" diff --git a/rtrefresh/rt_refresh_manager.go b/rtrefresh/rt_refresh_manager.go index 6de69b026..c81e9e6ed 100644 --- a/rtrefresh/rt_refresh_manager.go +++ b/rtrefresh/rt_refresh_manager.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/go-multierror" - logging "github.com/ipfs/go-log" + logging "github.com/ipfs/go-log/v2" "github.com/libp2p/go-libp2p-kad-dht/internal" kbucket "github.com/libp2p/go-libp2p-kbucket" "github.com/libp2p/go-libp2p/core/host"