@cryptotaxi247 / kubo / commits / 94bdce63a

vendor logging lib update

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

Jeromy committed Oct 29, 2015 at 21:22 UTC 94bdce63a7d51e7ffee09fdbb6a5fa4d47ae1c6f
103 files changed +610 -157
Godeps/Godeps.json
+4
@@ -99,6 +99,10 @@
99 "ImportPath": "github.com/dustin/go-humanize",
100 "Rev": "00897f070f09f194c26d65afae734ba4c32404e8"
101 },
102 + {
103 + "ImportPath": "github.com/dustin/randbo",
104 + "Rev": "7f1b564ca7242d22bcc6e2128beb90d9fa38b9f0"
105 + },
106 {
107 "ImportPath": "github.com/facebookgo/atomicfile",
108 "Rev": "6f117f2e7f224fb03eb5e5fba370eade6e2b90c8"
Godeps/_workspace/src/github.com/dustin/randbo/.gitignore new
+2
@@ -0,0 +1,2 @@
1 +
2 +*~
Godeps/_workspace/src/github.com/dustin/randbo/README.markdown new
+11
@@ -0,0 +1,11 @@
1 +A fast random number `io.Reader` implementation.
2 +
3 +![randbo](https://raw.github.com/dustin/randbo/master/randbo.png)
4 +
5 +> IN A WORLD where no integer sequence is certain ...
6 +>
7 +> ONE MAN must become statistically indistinguishable from noise
8 +>
9 +> THIS SUMMER, entropy has a new name: RANDBO
10 +
11 +(thanks @snej)
Godeps/_workspace/src/github.com/dustin/randbo/randbo.go new
+40
@@ -0,0 +1,40 @@
1 +package randbo
2 +
3 +import (
4 + "io"
5 + "math/rand"
6 + "time"
7 +)
8 +
9 +// Randbo creates a stream of non-crypto quality random bytes
10 +type randbo struct {
11 + rand.Source
12 +}
13 +
14 +// New creates a new random reader with a time source.
15 +func New() io.Reader {
16 + return NewFrom(rand.NewSource(time.Now().UnixNano()))
17 +}
18 +
19 +// NewFrom creates a new reader from your own rand.Source
20 +func NewFrom(src rand.Source) io.Reader {
21 + return &randbo{src}
22 +}
23 +
24 +// Read satisfies io.Reader
25 +func (r *randbo) Read(p []byte) (n int, err error) {
26 + todo := len(p)
27 + offset := 0
28 + for {
29 + val := int64(r.Int63())
30 + for i := 0; i < 8; i++ {
31 + p[offset] = byte(val)
32 + todo--
33 + if todo == 0 {
34 + return len(p), nil
35 + }
36 + offset++
37 + val >>= 8
38 + }
39 + }
40 +}
Godeps/_workspace/src/github.com/dustin/randbo/randbo.png
Binary files /dev/null and b/Godeps/_workspace/src/github.com/dustin/randbo/randbo.png differ
Godeps/_workspace/src/github.com/dustin/randbo/randbo_test.go new
+37
@@ -0,0 +1,37 @@
1 +package randbo
2 +
3 +import (
4 + "crypto/rand"
5 + "io"
6 + "io/ioutil"
7 + "testing"
8 +)
9 +
10 +func TestRandbo(t *testing.T) {
11 + buf := make([]byte, 16)
12 + n, err := New().Read(buf)
13 + if err != nil {
14 + t.Fatalf("Error reading: %v", err)
15 + }
16 + if n != len(buf) {
17 + t.Fatalf("Short read: %v", n)
18 + }
19 + t.Logf("Read %x", buf)
20 +}
21 +
22 +const toCopy = 1024 * 1024
23 +
24 +func BenchmarkRandbo(b *testing.B) {
25 + b.SetBytes(toCopy)
26 + r := New()
27 + for i := 0; i < b.N; i++ {
28 + io.CopyN(ioutil.Discard, r, toCopy)
29 + }
30 +}
31 +
32 +func BenchmarkCrypto(b *testing.B) {
33 + b.SetBytes(toCopy)
34 + for i := 0; i < b.N; i++ {
35 + io.CopyN(ioutil.Discard, rand.Reader, toCopy)
36 + }
37 +}
Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "runtime"
9 "testing"
10
11 - rand "github.com/dustin/randbo"
11 + rand "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/randbo"
12 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
13 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs"
14 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
Godeps/_workspace/src/github.com/jbenet/go-datastore/test/test_util.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "encoding/base32"
6 "testing"
7
8 - rand "github.com/dustin/randbo"
8 + rand "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/randbo"
9 dstore "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
10 )
11
Godeps/_workspace/src/github.com/whyrusleeping/go-multiplex/multiplex_test.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "net"
7 "testing"
8
9 - rand "github.com/dustin/randbo"
9 + rand "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/randbo"
10 )
11
12 func TestBasicStreams(t *testing.T) {
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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
7 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
31 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
24 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
36 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
9 )
10
11 var log = logging.Logger("corerepo")
core/coreunix/add.go
+1 -1
@@ -14,8 +14,8 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 unixfs "github.com/ipfs/go-ipfs/unixfs"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
19 )
20
21 var log = logging.Logger("coreunix")
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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
23 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
25 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
14 )
15
16 var log = logging.Logger("mount")
fuse/readonly/readonly_unix.go
+1 -1
@@ -16,10 +16,10 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 uio "github.com/ipfs/go-ipfs/unixfs/io"
20 ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
21 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
22 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
23 )
24
25 var log = logging.Logger("fuse/ipfs")
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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
7 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
28 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
21 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
22 )
23
24 var errNoEntry = errors.New("no previous entry")
namesys/routing.go
+1 -1
@@ -8,13 +8,13 @@ import (
8 lru "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/hashicorp/golang-lru"
9 mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
10 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11 - logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11
12 key "github.com/ipfs/go-ipfs/blocks/key"
13 pb "github.com/ipfs/go-ipfs/namesys/pb"
14 path "github.com/ipfs/go-ipfs/path"
15 routing "github.com/ipfs/go-ipfs/routing"
16 u "github.com/ipfs/go-ipfs/util"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
18 )
19
20 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
26 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
11 )
12
13 var log = logging.Logger("p2p/host")
p2p/host/routed/routed.go
+1 -1
@@ -6,8 +6,8 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
11
12 metrics "github.com/ipfs/go-ipfs/metrics"
13 host "github.com/ipfs/go-ipfs/p2p/host"
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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
19 )
20
21 var (
p2p/net/conn/conn.go
+1 -1
@@ -13,9 +13,9 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 u "github.com/ipfs/go-ipfs/util"
17 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
18 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
19 )
20
21 var log = logging.Logger("conn")
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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
4 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
6 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
6 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
7 )
8
9 var log = logging.Logger("peerqueue")
p2p/protocol/identify/id.go
+1 -1
@@ -16,8 +16,8 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
19 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
20 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
21 )
22
23 var log = logging.Logger("net/identify")
p2p/protocol/mux.go
+1 -1
@@ -7,8 +7,8 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
12 )
13
14 var log = logging.Logger("net/mux")
p2p/protocol/ping/ping.go
+1 -1
@@ -11,8 +11,8 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 u "github.com/ipfs/go-ipfs/util"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
16 )
17
18 var log = logging.Logger("ping")
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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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,8 +12,8 @@ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 u "github.com/ipfs/go-ipfs/util"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
17
18 ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
19 context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
p2p/test/util/key.go
+1 -1
@@ -5,9 +5,9 @@ import (
5 "io"
6 "testing"
7
8 - logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
8 u "github.com/ipfs/go-ipfs/util"
9 testutil "github.com/ipfs/go-ipfs/util/testutil"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
11
12 ic "github.com/ipfs/go-ipfs/p2p/crypto"
13 peer "github.com/ipfs/go-ipfs/p2p/peer"
package.json
+11 -7
@@ -1,14 +1,18 @@
1 {
2 "name": "go-ipfs",
3 - "version": "1.0.0",
4 - "dependencies": [
3 + "version": "0.3.8",
4 + "gxDependencies": [
5 {
6 - "name": "dir-index-html",
7 - "hash": "QmdDfkqDWheE4gsCXNrhixwTwSHnZMPT2cGLcNbiBNcMyU"
6 + "name": "go-log",
7 + "hash": "QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b",
8 + "version": "1.0.0"
9 },
10 {
10 - "name": "go-log",
11 - "hash": "QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv"
11 + "name": "dir-index-html",
12 + "hash": "QmdDfkqDWheE4gsCXNrhixwTwSHnZMPT2cGLcNbiBNcMyU",
13 + "version": "1.0.0",
14 + "linkname": "dir-index-html-v1.0.0"
15 }
13 - ]
16 + ],
17 + "language": "go"
18 }
\ 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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
13 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
29 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
21 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
9 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
12 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
17 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
16 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
23 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
33 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
34 )
35
36 var elog = logging.Logger("gc-client")
thirdparty/pollEndpoint/main.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
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"
15 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
16 )
17
18 var (
tour/tour.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "strconv"
5 "strings"
6
7 - logging "github.com/ipfs/go-ipfs/vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
7 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
22 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
11 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
14 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/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/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log"
10 + logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
11 )
12
13 var log = logging.Logger("ipfsaddr")
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/.gxlastpubver new
+1
@@ -0,0 +1 @@
1 +1.0.0: QmXQEqXS3TDyhAFGBFeMadaBYJ2ismXXyQSn5i7HubcQUH
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/context.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/context_test.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/entry.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/example_test.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/log.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/loggable.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/metadata.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/metadata_test.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/oldlog.go renamed
+6 -5
@@ -2,6 +2,7 @@ package log
2
3 import (
4 "errors"
5 + "fmt"
6 "os"
7
8 logging "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/go-logging"
@@ -37,14 +38,14 @@ var loggers = map[string]*logging.Logger{}
38 // SetupLogging will initialize the logger backend and set the flags.
39 func SetupLogging() {
40
40 - fmt := LogFormats[os.Getenv(envLoggingFmt)]
41 - if fmt == "" {
42 - fmt = LogFormats[defaultLogFormat]
41 + lfmt := LogFormats[os.Getenv(envLoggingFmt)]
42 + if lfmt == "" {
43 + lfmt = LogFormats[defaultLogFormat]
44 }
45
46 backend := logging.NewLogBackend(os.Stderr, "", 0)
47 logging.SetBackend(backend)
47 - logging.SetFormatter(logging.MustStringFormatter(fmt))
48 + logging.SetFormatter(logging.MustStringFormatter(lfmt))
49
50 lvl := logging.ERROR
51
@@ -52,7 +53,7 @@ func SetupLogging() {
53 var err error
54 lvl, err = logging.LogLevel(logenv)
55 if err != nil {
55 -
56 + fmt.Println("error setting log levels", err)
57 }
58 }
59
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/option.go renamed
+1 -11
@@ -2,22 +2,12 @@ package log
2
3 import (
4 "io"
5 - "os"
5
6 logging "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/go-logging"
7 )
8
10 -// init sets up sane defaults
11 -func init() {
12 - Configure(TextFormatter)
13 - Configure(Output(os.Stderr))
14 - // has the effect of disabling logging since we log event entries at Info
15 - // level by convention
16 - Configure(LevelError)
17 -}
18 -
9 // Global writer group for logs to output to
20 -var WriterGroup = new(MirrorWriter)
10 +var WriterGroup = NewMirrorWriter()
11
12 type Option func()
13
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/package.json new
+8
@@ -0,0 +1,8 @@
1 +{
2 + "name": "go-log",
3 + "version": "1.0.0",
4 + "language": "go",
5 + "go":{
6 + "dvcsimport":"github.com/ipfs/go-log"
7 + }
8 +}
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/polite_json_formatter.go renamed
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/writer.go new
+251
@@ -0,0 +1,251 @@
1 +package log
2 +
3 +import (
4 + "fmt"
5 + "io"
6 + "sync"
7 +)
8 +
9 +var MaxWriterBuffer = 512 * 1024
10 +
11 +var log = Logger("eventlog")
12 +
13 +type MirrorWriter struct {
14 + active bool
15 + activelk sync.Mutex
16 +
17 + // channel for incoming writers
18 + writerAdd chan *writerAdd
19 +
20 + // slices of writer/sync-channel pairs
21 + writers []*bufWriter
22 +
23 + // synchronization channel for incoming writes
24 + msgSync chan []byte
25 +}
26 +
27 +type writerSync struct {
28 + w io.WriteCloser
29 + br chan []byte
30 +}
31 +
32 +func NewMirrorWriter() *MirrorWriter {
33 + mw := &MirrorWriter{
34 + msgSync: make(chan []byte, 64), // sufficiently large buffer to avoid callers waiting
35 + writerAdd: make(chan *writerAdd),
36 + }
37 +
38 + go mw.logRoutine()
39 +
40 + return mw
41 +}
42 +
43 +func (mw *MirrorWriter) Write(b []byte) (int, error) {
44 + mycopy := make([]byte, len(b))
45 + copy(mycopy, b)
46 + mw.msgSync <- mycopy
47 + return len(b), nil
48 +}
49 +
50 +func (mw *MirrorWriter) Close() error {
51 + // it is up to the caller to ensure that write is not called during or
52 + // after close is called.
53 + close(mw.msgSync)
54 + return nil
55 +}
56 +
57 +func (mw *MirrorWriter) doClose() {
58 + for _, w := range mw.writers {
59 + w.writer.Close()
60 + }
61 +}
62 +
63 +func (mw *MirrorWriter) logRoutine() {
64 + // rebind to avoid races on nilling out struct fields
65 + msgSync := mw.msgSync
66 + writerAdd := mw.writerAdd
67 +
68 + defer mw.doClose()
69 +
70 + for {
71 + select {
72 + case b, ok := <-msgSync:
73 + if !ok {
74 + return
75 + }
76 +
77 + // write to all writers
78 + dropped := mw.broadcastMessage(b)
79 +
80 + // consolidate the slice
81 + if dropped {
82 + mw.clearDeadWriters()
83 + }
84 + case wa := <-writerAdd:
85 + mw.writers = append(mw.writers, newBufWriter(wa.w))
86 +
87 + mw.activelk.Lock()
88 + mw.active = true
89 + mw.activelk.Unlock()
90 + close(wa.done)
91 + }
92 + }
93 +}
94 +
95 +// broadcastMessage sends the given message to every writer
96 +// if any writer is killed during the send, 'true' is returned
97 +func (mw *MirrorWriter) broadcastMessage(b []byte) bool {
98 + var dropped bool
99 + for i, w := range mw.writers {
100 + _, err := w.Write(b)
101 + if err != nil {
102 + mw.writers[i] = nil
103 + dropped = true
104 + }
105 + }
106 + return dropped
107 +}
108 +
109 +func (mw *MirrorWriter) clearDeadWriters() {
110 + writers := mw.writers
111 + mw.writers = nil
112 + for _, w := range writers {
113 + if w != nil {
114 + mw.writers = append(mw.writers, w)
115 + }
116 + }
117 + if len(mw.writers) == 0 {
118 + mw.activelk.Lock()
119 + mw.active = false
120 + mw.activelk.Unlock()
121 + }
122 +}
123 +
124 +type writerAdd struct {
125 + w io.WriteCloser
126 + done chan struct{}
127 +}
128 +
129 +func (mw *MirrorWriter) AddWriter(w io.WriteCloser) {
130 + wa := &writerAdd{
131 + w: w,
132 + done: make(chan struct{}),
133 + }
134 + mw.writerAdd <- wa
135 + <-wa.done
136 +}
137 +
138 +func (mw *MirrorWriter) Active() (active bool) {
139 + mw.activelk.Lock()
140 + active = mw.active
141 + mw.activelk.Unlock()
142 + return
143 +}
144 +
145 +func newBufWriter(w io.WriteCloser) *bufWriter {
146 + bw := &bufWriter{
147 + writer: w,
148 + incoming: make(chan []byte, 1),
149 + }
150 +
151 + go bw.loop()
152 + return bw
153 +}
154 +
155 +type bufWriter struct {
156 + writer io.WriteCloser
157 +
158 + incoming chan []byte
159 +
160 + deathLock sync.Mutex
161 + dead bool
162 +}
163 +
164 +var errDeadWriter = fmt.Errorf("writer is dead")
165 +
166 +func (bw *bufWriter) Write(b []byte) (int, error) {
167 + bw.deathLock.Lock()
168 + dead := bw.dead
169 + bw.deathLock.Unlock()
170 + if dead {
171 + if bw.incoming != nil {
172 + close(bw.incoming)
173 + bw.incoming = nil
174 + }
175 + return 0, errDeadWriter
176 + }
177 +
178 + bw.incoming <- b
179 + return len(b), nil
180 +}
181 +
182 +func (bw *bufWriter) die() {
183 + bw.deathLock.Lock()
184 + bw.dead = true
185 + bw.writer.Close()
186 + bw.deathLock.Unlock()
187 +}
188 +
189 +func (bw *bufWriter) loop() {
190 + bufsize := 0
191 + bufBase := make([][]byte, 0, 16) // some initial memory
192 + buffered := bufBase
193 + nextCh := make(chan []byte)
194 +
195 + var nextMsg []byte
196 +
197 + go func() {
198 + for b := range nextCh {
199 + _, err := bw.writer.Write(b)
200 + if err != nil {
201 + log.Info("eventlog write error: %s", err)
202 + bw.die()
203 + return
204 + }
205 + }
206 + }()
207 +
208 + // collect and buffer messages
209 + incoming := bw.incoming
210 + for {
211 + if nextMsg == nil || nextCh == nil {
212 + // nextCh == nil implies we are 'dead' and draining the incoming channel
213 + // until the caller notices and closes it for us
214 + select {
215 + case b, ok := <-incoming:
216 + if !ok {
217 + return
218 + }
219 + nextMsg = b
220 + }
221 + }
222 +
223 + select {
224 + case b, ok := <-incoming:
225 + if !ok {
226 + return
227 + }
228 + bufsize += len(b)
229 + buffered = append(buffered, b)
230 + if bufsize > MaxWriterBuffer {
231 + // if we have too many messages buffered, kill the writer
232 + bw.die()
233 + close(nextCh)
234 + nextCh = nil
235 + // explicity keep going here to drain incoming
236 + }
237 + case nextCh <- nextMsg:
238 + nextMsg = nil
239 + if len(buffered) > 0 {
240 + nextMsg = buffered[0]
241 + buffered = buffered[1:]
242 + bufsize -= len(nextMsg)
243 + }
244 +
245 + if len(buffered) == 0 {
246 + // reset slice position
247 + buffered = bufBase[:0]
248 + }
249 + }
250 + }
251 +}
vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log/writer_test.go new
+160
@@ -0,0 +1,160 @@
1 +package log
2 +
3 +import (
4 + "fmt"
5 + "hash/fnv"
6 + "io"
7 + "sync"
8 + "testing"
9 + "time"
10 +
11 + randbo "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/randbo"
12 +)
13 +
14 +type hangwriter struct {
15 + c chan struct{}
16 +}
17 +
18 +func newHangWriter() *hangwriter {
19 + return &hangwriter{make(chan struct{})}
20 +}
21 +
22 +func (hw *hangwriter) Write([]byte) (int, error) {
23 + <-make(chan struct{})
24 + return 0, fmt.Errorf("write on closed writer")
25 +}
26 +
27 +func (hw *hangwriter) Close() error {
28 + close(hw.c)
29 + return nil
30 +}
31 +
32 +func TestMirrorWriterHang(t *testing.T) {
33 + mw := NewMirrorWriter()
34 +
35 + hw := newHangWriter()
36 + pr, pw := io.Pipe()
37 +
38 + mw.AddWriter(hw)
39 + mw.AddWriter(pw)
40 +
41 + msg := "Hello!"
42 + mw.Write([]byte(msg))
43 +
44 + // make sure writes through can happen even with one writer hanging
45 + done := make(chan struct{})
46 + go func() {
47 + buf := make([]byte, 10)
48 + n, err := pr.Read(buf)
49 + if err != nil {
50 + t.Fatal(err)
51 + }
52 +
53 + if n != len(msg) {
54 + t.Fatal("read wrong amount")
55 + }
56 +
57 + if string(buf[:n]) != msg {
58 + t.Fatal("didnt read right content")
59 + }
60 +
61 + done <- struct{}{}
62 + }()
63 +
64 + select {
65 + case <-time.After(time.Second * 5):
66 + t.Fatal("write to mirrorwriter hung")
67 + case <-done:
68 + }
69 +
70 + if !mw.Active() {
71 + t.Fatal("writer should still be active")
72 + }
73 +
74 + pw.Close()
75 +
76 + if !mw.Active() {
77 + t.Fatal("writer should still be active")
78 + }
79 +
80 + // now we just have the hangwriter
81 +
82 + // write a bunch to it
83 + buf := make([]byte, 8192)
84 + for i := 0; i < 128; i++ {
85 + mw.Write(buf)
86 + }
87 +
88 + // wait for goroutines to sync up
89 + time.Sleep(time.Millisecond * 500)
90 +
91 + // the hangwriter should have been killed, causing the mirrorwriter to be inactive now
92 + if mw.Active() {
93 + t.Fatal("should be inactive now")
94 + }
95 +}
96 +
97 +func TestStress(t *testing.T) {
98 + mw := NewMirrorWriter()
99 +
100 + nreaders := 20
101 +
102 + var readers []io.Reader
103 + for i := 0; i < nreaders; i++ {
104 + pr, pw := io.Pipe()
105 + mw.AddWriter(pw)
106 + readers = append(readers, pr)
107 + }
108 +
109 + hashout := make(chan []byte)
110 +
111 + numwriters := 20
112 + writesize := 1024
113 + writecount := 300
114 +
115 + f := func(r io.Reader) {
116 + h := fnv.New64a()
117 + sum, err := io.Copy(h, r)
118 + if err != nil {
119 + t.Fatal(err)
120 + }
121 +
122 + if sum != int64(numwriters*writesize*writecount) {
123 + t.Fatal("read wrong number of bytes")
124 + }
125 +
126 + hashout <- h.Sum(nil)
127 + }
128 +
129 + for _, r := range readers {
130 + go f(r)
131 + }
132 +
133 + work := sync.WaitGroup{}
134 + for i := 0; i < numwriters; i++ {
135 + work.Add(1)
136 + go func() {
137 + defer work.Done()
138 + r := randbo.New()
139 + buf := make([]byte, writesize)
140 + for j := 0; j < writecount; j++ {
141 + r.Read(buf)
142 + mw.Write(buf)
143 + time.Sleep(time.Millisecond * 5)
144 + }
145 + }()
146 + }
147 +
148 + work.Wait()
149 + mw.Close()
150 +
151 + check := make(map[string]bool)
152 + for i := 0; i < nreaders; i++ {
153 + h := <-hashout
154 + check[string(h)] = true
155 + }
156 +
157 + if len(check) > 1 {
158 + t.Fatal("writers received different data!")
159 + }
160 +}
vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log/.gxlastpubver deleted
-1
@@ -1 +0,0 @@
1 -QmSCNsgSxWo9cTi8PPfu4gZVCY5qcUsX48gvppQzuuYCJB
\ No newline at end of file
vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log/package.json deleted
-5
@@ -1,5 +0,0 @@
1 -{
2 - "name": "go-log",
3 - "version": "1.0.0",
4 - "language": "go"
5 -}
\ No newline at end of file
vendor/QmTBXYb6y2ZcJmoXVKk3pf9rzSEjbCg7tQaJW7RSuH14nv/go-log/writer.go deleted
-50
@@ -1,50 +0,0 @@
1 -package log
2 -
3 -import (
4 - "io"
5 - "sync"
6 -)
7 -
8 -type MirrorWriter struct {
9 - writers []io.Writer
10 - lk sync.Mutex
11 -}
12 -
13 -func (mw *MirrorWriter) Write(b []byte) (int, error) {
14 - mw.lk.Lock()
15 - // write to all writers, and nil out the broken ones.
16 - var dropped bool
17 - for i, w := range mw.writers {
18 - _, err := w.Write(b)
19 - if err != nil {
20 - mw.writers[i] = nil
21 - dropped = true
22 - }
23 - }
24 -
25 - // consolidate the slice
26 - if dropped {
27 - writers := mw.writers
28 - mw.writers = nil
29 - for _, w := range writers {
30 - if w != nil {
31 - mw.writers = append(mw.writers, w)
32 - }
33 - }
34 - }
35 - mw.lk.Unlock()
36 - return len(b), nil
37 -}
38 -
39 -func (mw *MirrorWriter) AddWriter(w io.Writer) {
40 - mw.lk.Lock()
41 - mw.writers = append(mw.writers, w)
42 - mw.lk.Unlock()
43 -}
44 -
45 -func (mw *MirrorWriter) Active() (active bool) {
46 - mw.lk.Lock()
47 - active = len(mw.writers) > 0
48 - mw.lk.Unlock()
49 - return
50 -}