@cryptotaxi247 / kubo / commits / c023d187b

update code to use new logging changes

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Jeromy committed Oct 27, 2015 at 10:47 UTC c023d187b5f1f914ad11b23363a181a288ae83b1
76 files changed +87 -93
blocks/blockstore/blockstore.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13 blocks "github.com/ipfs/go-ipfs/blocks"
14 key "github.com/ipfs/go-ipfs/blocks/key"
15 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 )
17
18 var log = logging.Logger("blockstore")
blocks/set/set.go
+1 -1
@@ -4,7 +4,7 @@ package set
4 import (
5 "github.com/ipfs/go-ipfs/blocks/bloom"
6 key "github.com/ipfs/go-ipfs/blocks/key"
7 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
7 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 )
9
10 var log = logging.Logger("blockset")
blockservice/blockservice.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 "github.com/ipfs/go-ipfs/blocks/blockstore"
12 key "github.com/ipfs/go-ipfs/blocks/key"
13 exchange "github.com/ipfs/go-ipfs/exchange"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 )
16
17 var log = logging.Logger("blockservice")
cmd/ipfs/main.go
+1 -1
@@ -28,7 +28,7 @@ import (
28 config "github.com/ipfs/go-ipfs/repo/config"
29 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
30 u "github.com/ipfs/go-ipfs/util"
31 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
31 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
32 )
33
34 // log is the command logger
cmd/seccat/seccat.go
+1 -1
@@ -21,7 +21,7 @@ import (
21 ci "github.com/ipfs/go-ipfs/p2p/crypto"
22 secio "github.com/ipfs/go-ipfs/p2p/crypto/secio"
23 peer "github.com/ipfs/go-ipfs/p2p/peer"
24 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
24 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
25 )
26
27 var verbose = false
cmd/seccat/util.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6 "os"
7
8 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 )
10
11 var log = logging.Logger("seccat")
commands/command.go
+1 -1
@@ -15,7 +15,7 @@ import (
15 "reflect"
16 "strings"
17
18 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 )
20
21 var log = logging.Logger("command")
commands/http/handler.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
17
18 cmds "github.com/ipfs/go-ipfs/commands"
19 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
19 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
20 )
21
22 var log = logging.Logger("commands/http")
core/commands/log.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6
7 cmds "github.com/ipfs/go-ipfs/commands"
8 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 )
10
11 // Golang os.Args overrides * and replaces the character argument with
core/commands/root.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 cmds "github.com/ipfs/go-ipfs/commands"
8 unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs"
9 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 )
11
12 var log = logging.Logger("core/commands")
core/core.go
+1 -1
@@ -33,7 +33,7 @@ import (
33 addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
34 peer "github.com/ipfs/go-ipfs/p2p/peer"
35 ping "github.com/ipfs/go-ipfs/p2p/protocol/ping"
36 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
36 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
37
38 routing "github.com/ipfs/go-ipfs/routing"
39 dht "github.com/ipfs/go-ipfs/routing/dht"
core/corehttp/corehttp.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
15 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
16 core "github.com/ipfs/go-ipfs/core"
17 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 )
19
20 var log = logging.Logger("core/server")
core/corehttp/logs.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "net/http"
7
8 core "github.com/ipfs/go-ipfs/core"
9 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 )
11
12 type writeErrNotifier struct {
core/corerepo/gc.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 key "github.com/ipfs/go-ipfs/blocks/key"
6 "github.com/ipfs/go-ipfs/core"
7
8 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 )
10
11 var log = logging.Logger("corerepo")
core/coreunix/add.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 chunk "github.com/ipfs/go-ipfs/importer/chunk"
15 merkledag "github.com/ipfs/go-ipfs/merkledag"
16 "github.com/ipfs/go-ipfs/pin"
17 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 unixfs "github.com/ipfs/go-ipfs/unixfs"
19 )
20
diagnostics/diag.go
+1 -1
@@ -20,7 +20,7 @@ import (
20 inet "github.com/ipfs/go-ipfs/p2p/net"
21 peer "github.com/ipfs/go-ipfs/p2p/peer"
22 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
23 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
23 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
24 )
25
26 var log = logging.Logger("diagnostics")
exchange/bitswap/bitswap.go
+1 -1
@@ -22,7 +22,7 @@ import (
22 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
23 peer "github.com/ipfs/go-ipfs/p2p/peer"
24 "github.com/ipfs/go-ipfs/thirdparty/delay"
25 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
25 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
26 )
27
28 var log = logging.Logger("bitswap")
exchange/bitswap/decision/engine.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
11 wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
12 peer "github.com/ipfs/go-ipfs/p2p/peer"
13 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 )
15
16 // TODO consider taking responsibility for other types of requests. For
exchange/bitswap/network/ipfs_impl.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 inet "github.com/ipfs/go-ipfs/p2p/net"
10 peer "github.com/ipfs/go-ipfs/p2p/peer"
11 routing "github.com/ipfs/go-ipfs/routing"
12 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
12 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 )
14
15 var log = logging.Logger("bitswap_network")
exchange/bitswap/workers.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
10 key "github.com/ipfs/go-ipfs/blocks/key"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 )
13
14 var TaskWorkerCount = 8
exchange/reprovide/reprovide.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9 blocks "github.com/ipfs/go-ipfs/blocks/blockstore"
10 routing "github.com/ipfs/go-ipfs/routing"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 )
13
14 var log = logging.Logger("reprovider")
fuse/ipns/ipns_unix.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
14 fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
15 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17
18 key "github.com/ipfs/go-ipfs/blocks/key"
19 core "github.com/ipfs/go-ipfs/core"
fuse/mount/mount.go
+1 -1
@@ -10,7 +10,7 @@ import (
10
11 goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
12
13 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 )
15
16 var log = logging.Logger("mount")
fuse/readonly/readonly_unix.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 core "github.com/ipfs/go-ipfs/core"
17 mdag "github.com/ipfs/go-ipfs/merkledag"
18 path "github.com/ipfs/go-ipfs/path"
19 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
19 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
20 uio "github.com/ipfs/go-ipfs/unixfs/io"
21 ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
22 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
importer/chunk/splitting.go
+1 -1
@@ -4,7 +4,7 @@ package chunk
4 import (
5 "io"
6
7 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
7 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 )
9
10 var log = logging.Logger("chunk")
importer/importer.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 trickle "github.com/ipfs/go-ipfs/importer/trickle"
14 dag "github.com/ipfs/go-ipfs/merkledag"
15 "github.com/ipfs/go-ipfs/pin"
16 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 )
18
19 var log = logging.Logger("importer")
ipnsfs/system.go
+1 -1
@@ -25,7 +25,7 @@ import (
25 ft "github.com/ipfs/go-ipfs/unixfs"
26
27 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
28 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
28 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
29 )
30
31 var log = logging.Logger("ipnsfs")
merkledag/merkledag.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 blocks "github.com/ipfs/go-ipfs/blocks"
10 key "github.com/ipfs/go-ipfs/blocks/key"
11 bserv "github.com/ipfs/go-ipfs/blockservice"
12 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
12 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 )
14
15 var log = logging.Logger("merkledag")
namesys/republisher/repub.go
+1 -1
@@ -18,7 +18,7 @@ import (
18 goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
19 gpctx "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
20 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
21 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
21 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
22 )
23
24 var errNoEntry = errors.New("no previous entry")
namesys/routing.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 pb "github.com/ipfs/go-ipfs/namesys/pb"
12 path "github.com/ipfs/go-ipfs/path"
13 routing "github.com/ipfs/go-ipfs/routing"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 )
16
17 var log = logging.Logger("namesys")
p2p/crypto/key.go
+1 -1
@@ -23,7 +23,7 @@ import (
23
24 pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
25 u "github.com/ipfs/go-ipfs/util"
26 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
26 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
27 )
28
29 var log = logging.Logger("crypto")
p2p/crypto/secio/protocol.go
+1 -1
@@ -15,7 +15,7 @@ import (
15 pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/pb"
16 peer "github.com/ipfs/go-ipfs/p2p/peer"
17 u "github.com/ipfs/go-ipfs/util"
18 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 )
20
21 var log = logging.Logger("secio")
p2p/discovery/mdns.go
+1 -1
@@ -15,7 +15,7 @@ import (
15
16 "github.com/ipfs/go-ipfs/p2p/host"
17 "github.com/ipfs/go-ipfs/p2p/peer"
18 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 )
20
21 var log = logging.Logger("mdns")
p2p/host/basic/basic_host.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9 metrics "github.com/ipfs/go-ipfs/metrics"
10 mstream "github.com/ipfs/go-ipfs/metrics/stream"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12
13 inet "github.com/ipfs/go-ipfs/p2p/net"
14 peer "github.com/ipfs/go-ipfs/p2p/peer"
p2p/host/host.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 inet "github.com/ipfs/go-ipfs/p2p/net"
8 peer "github.com/ipfs/go-ipfs/p2p/peer"
9 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
10 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 )
12
13 var log = logging.Logger("p2p/host")
p2p/host/routed/routed.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
8 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
11
12 metrics "github.com/ipfs/go-ipfs/metrics"
p2p/nat/nat.go
+1 -1
@@ -15,7 +15,7 @@ import (
15 goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
16 periodic "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic"
17 notifier "github.com/ipfs/go-ipfs/thirdparty/notifier"
18 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 )
20
21 var (
p2p/net/conn/conn.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14 ic "github.com/ipfs/go-ipfs/p2p/crypto"
15 peer "github.com/ipfs/go-ipfs/p2p/peer"
16 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 u "github.com/ipfs/go-ipfs/util"
18 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
19 )
p2p/net/mock/mock.go
+1 -1
@@ -1,7 +1,7 @@
1 package mocknet
2
3 import (
4 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
4 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
5
6 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7 )
p2p/net/swarm/addr/addr.go
+1 -1
@@ -3,7 +3,7 @@ package addrutil
3 import (
4 "fmt"
5
6 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
6 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
7
8 ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9 manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
p2p/net/swarm/swarm.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 filter "github.com/ipfs/go-ipfs/p2p/net/filter"
13 addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
14 peer "github.com/ipfs/go-ipfs/p2p/peer"
15 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16
17 ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
18 ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
p2p/peer/peer.go
+1 -1
@@ -13,7 +13,7 @@ import (
13
14 ic "github.com/ipfs/go-ipfs/p2p/crypto"
15 u "github.com/ipfs/go-ipfs/util"
16 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 )
18
19 var log = logging.Logger("peer")
p2p/peer/queue/sync.go
+1 -1
@@ -3,7 +3,7 @@ package queue
3 import (
4 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5 peer "github.com/ipfs/go-ipfs/p2p/peer"
6 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
6 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
7 )
8
9 var log = logging.Logger("peerqueue")
p2p/protocol/identify/id.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
17 pb "github.com/ipfs/go-ipfs/p2p/protocol/identify/pb"
18 config "github.com/ipfs/go-ipfs/repo/config"
19 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
19 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
20 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
21 )
22
p2p/protocol/mux.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9 inet "github.com/ipfs/go-ipfs/p2p/net"
10 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
12 )
13
p2p/protocol/ping/ping.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 host "github.com/ipfs/go-ipfs/p2p/host"
12 inet "github.com/ipfs/go-ipfs/p2p/net"
13 peer "github.com/ipfs/go-ipfs/p2p/peer"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 u "github.com/ipfs/go-ipfs/util"
16 )
17
p2p/protocol/relay/relay.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 inet "github.com/ipfs/go-ipfs/p2p/net"
11 peer "github.com/ipfs/go-ipfs/p2p/peer"
12 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
13 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 )
15
16 var log = logging.Logger("p2p/protocol/relay")
p2p/protocol/relay/relay_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
9 relay "github.com/ipfs/go-ipfs/p2p/protocol/relay"
10 testutil "github.com/ipfs/go-ipfs/p2p/test/util"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12
13 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14 )
p2p/test/backpressure/backpressure_test.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 peer "github.com/ipfs/go-ipfs/p2p/peer"
12 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
13 testutil "github.com/ipfs/go-ipfs/p2p/test/util"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15
16 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
17 u "github.com/ipfs/go-ipfs/util"
p2p/test/reconnects/reconnect_test.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
13 protocol "github.com/ipfs/go-ipfs/p2p/protocol"
14 testutil "github.com/ipfs/go-ipfs/p2p/test/util"
15 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 u "github.com/ipfs/go-ipfs/util"
17
18 ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
p2p/test/util/key.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6 "testing"
7
8 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 u "github.com/ipfs/go-ipfs/util"
10 testutil "github.com/ipfs/go-ipfs/util/testutil"
11
package.json
+2 -2
@@ -8,7 +8,7 @@
8 },
9 {
10 "name": "go-log",
11 - "hash": "QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8"
11 + "hash": "QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv"
12 }
13 ]
14 -}
14 +}
\ No newline at end of file
path/resolver.go
+1 -1
@@ -11,7 +11,7 @@ import (
11
12 key "github.com/ipfs/go-ipfs/blocks/key"
13 merkledag "github.com/ipfs/go-ipfs/merkledag"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 )
16
17 var log = logging.Logger("path")
pin/pin.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 key "github.com/ipfs/go-ipfs/blocks/key"
15 "github.com/ipfs/go-ipfs/blocks/set"
16 mdag "github.com/ipfs/go-ipfs/merkledag"
17 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 )
19
20 var log = logging.Logger("pin")
repo/config/config.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 "strings"
11
12 u "github.com/ipfs/go-ipfs/util"
13 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 )
15
16 var log = logging.Logger("config")
repo/fsrepo/fsrepo.go
+1 -1
@@ -26,7 +26,7 @@ import (
26 u "github.com/ipfs/go-ipfs/util"
27 util "github.com/ipfs/go-ipfs/util"
28 ds2 "github.com/ipfs/go-ipfs/util/datastore2"
29 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
29 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
30 )
31
32 // version number that we are currently expecting to see
repo/fsrepo/serialize/serialize.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/atomicfile"
12 "github.com/ipfs/go-ipfs/repo/config"
13 "github.com/ipfs/go-ipfs/util"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 )
16
17 var log = logging.Logger("fsrepo")
routing/dht/dht.go
+1 -1
@@ -18,7 +18,7 @@ import (
18 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
19 kb "github.com/ipfs/go-ipfs/routing/kbucket"
20 record "github.com/ipfs/go-ipfs/routing/record"
21 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
21 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
22
23 proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
24 ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
routing/dht/pb/message.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 key "github.com/ipfs/go-ipfs/blocks/key"
7 inet "github.com/ipfs/go-ipfs/p2p/net"
8 peer "github.com/ipfs/go-ipfs/p2p/peer"
9 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 )
11
12 var log = logging.Logger("dht.pb")
routing/dht/query.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 u "github.com/ipfs/go-ipfs/util"
12 pset "github.com/ipfs/go-ipfs/util/peerset"
13 todoctr "github.com/ipfs/go-ipfs/util/todocounter"
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15
16 process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
17 ctxproc "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
routing/kbucket/table.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "time"
9
10 peer "github.com/ipfs/go-ipfs/p2p/peer"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 )
13
14 var log = logging.Logger("table")
routing/mock/centralized_client.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
15 u "github.com/ipfs/go-ipfs/util"
16 "github.com/ipfs/go-ipfs/util/testutil"
17 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 )
19
20 var log = logging.Logger("mockrouter")
routing/none/none_client.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 p2phost "github.com/ipfs/go-ipfs/p2p/host"
10 peer "github.com/ipfs/go-ipfs/p2p/peer"
11 routing "github.com/ipfs/go-ipfs/routing"
12 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
12 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 )
14
15 var log = logging.Logger("mockrouter")
routing/offline/offline.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 routing "github.com/ipfs/go-ipfs/routing"
14 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
15 record "github.com/ipfs/go-ipfs/routing/record"
16 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 )
18
19 var log = logging.Logger("offlinerouting")
routing/record/record.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 ci "github.com/ipfs/go-ipfs/p2p/crypto"
10 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 )
13
14 var log = logging.Logger("routing/record")
routing/supernode/client.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 routing "github.com/ipfs/go-ipfs/routing"
15 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
16 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
17 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 )
19
20 var log = logging.Logger("supernode")
routing/supernode/proxy/standard.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 peer "github.com/ipfs/go-ipfs/p2p/peer"
13 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
14 kbucket "github.com/ipfs/go-ipfs/routing/kbucket"
15 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 )
17
18 const ProtocolSNR = "/ipfs/supernoderouting"
tar/format.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 dag "github.com/ipfs/go-ipfs/merkledag"
14 dagutil "github.com/ipfs/go-ipfs/merkledag/utils"
15 uio "github.com/ipfs/go-ipfs/unixfs/io"
16 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17
18 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
19 )
test/integration/addcat_test.go
+1 -1
@@ -20,7 +20,7 @@ import (
20 "github.com/ipfs/go-ipfs/p2p/peer"
21 "github.com/ipfs/go-ipfs/thirdparty/unit"
22 testutil "github.com/ipfs/go-ipfs/util/testutil"
23 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
23 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
24 )
25
26 var log = logging.Logger("epictest")
test/supernode_client/main.go
+1 -1
@@ -30,7 +30,7 @@ import (
30 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
31 unit "github.com/ipfs/go-ipfs/thirdparty/unit"
32 ds2 "github.com/ipfs/go-ipfs/util/datastore2"
33 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
33 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
34 )
35
36 var elog = logging.Logger("gc-client")
thirdparty/pollEndpoint/main.go
+11 -17
@@ -10,9 +10,9 @@ import (
10 "os"
11 "time"
12
13 - log "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
13 ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
14 manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 )
17
18 var (
@@ -23,25 +23,27 @@ var (
23 verbose = flag.Bool("v", false, "verbose logging")
24 )
25
26 +var log = logging.Logger("pollEndpoint")
27 +
28 func main() {
29 flag.Parse()
30
31 // extract address from host flag
32 addr, err := ma.NewMultiaddr(*host)
33 if err != nil {
32 - log.WithField("err", err).Fatal("NewMultiaddr() failed")
34 + log.Fatal("NewMultiaddr() failed: ", err)
35 }
36 p := addr.Protocols()
37 if len(p) < 2 {
36 - log.WithField("addr", addr).Fatal("need two protocols in host flag (/ip/tcp)")
38 + log.Fatal("need two protocols in host flag (/ip/tcp): ", addr)
39 }
40 _, host, err := manet.DialArgs(addr)
41 if err != nil {
40 - log.WithField("err", err).Fatal("manet.DialArgs() failed")
42 + log.Fatal("manet.DialArgs() failed: ", err)
43 }
44
45 if *verbose { // lower log level
44 - log.SetLevel(log.DebugLevel)
46 + logging.SetDebugLogging()
47 }
48
49 // construct url to dial
@@ -52,29 +54,21 @@ func main() {
54
55 // show what we got
56 start := time.Now()
55 - log.WithFields(log.Fields{
56 - "when": start,
57 - "tries": *tries,
58 - "timeout": *timeout,
59 - "url": u.String(),
60 - }).Debug("starting")
57 + log.Debug("starting at %s, tries: %d, timeout: %s, url: %s", start, *tries, *timeout, u)
58
59 for *tries > 0 {
63 - f := log.Fields{"tries": *tries}
60
61 err := checkOK(http.Get(u.String()))
62 if err == nil {
67 - f["took"] = time.Since(start)
68 - log.WithFields(f).Println("status ok - endpoint reachable")
63 + log.Debugf("ok - endpoint reachable with %d tries remaining, took %s", *tries, time.Since(start))
64 os.Exit(0)
65 }
71 - f["error"] = err
72 - log.WithFields(f).Debug("get failed")
66 + log.Debug("get failed: ", err)
67 time.Sleep(*timeout)
68 *tries--
69 }
70
77 - log.Println("failed.")
71 + log.Error("failed.")
72 os.Exit(1)
73 }
74
tour/tour.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "strconv"
5 "strings"
6
7 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
7 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 )
9
10 var log = logging.Logger("tour")
unixfs/mod/dagmodifier.go
+1 -1
@@ -19,7 +19,7 @@ import (
19 pin "github.com/ipfs/go-ipfs/pin"
20 ft "github.com/ipfs/go-ipfs/unixfs"
21 uio "github.com/ipfs/go-ipfs/unixfs/io"
22 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
22 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
23 )
24
25 var ErrSeekFail = errors.New("failed to seek properly")
updates/updates.go
+1 -1
@@ -8,7 +8,7 @@ import (
8
9 config "github.com/ipfs/go-ipfs/repo/config"
10 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12
13 semver "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
14 update "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update"
util/eventlog/loggables/loggables.go
+1 -1
@@ -11,7 +11,7 @@ import (
11
12 ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
13
14 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15
16 peer "github.com/ipfs/go-ipfs/p2p/peer"
17 )
util/ipfsaddr/ipfsaddr.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
8
9 peer "github.com/ipfs/go-ipfs/p2p/peer"
10 - logging "github.com/ipfs/go-ipfs/vendor/QmXJkcEXB6C9h6Ytb6rrUTFU56Ro62zxgrbxTT3dgjQGA8/go-log"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 )
12
13 var log = logging.Logger("ipfsaddr")