selected changes from CR
Jeromy committed
Jan 16, 2015 at 06:17 UTC
a6ec12a17dd9e20a19514e17c923a56794633a52
2 files changed
+14
-7
exchange/reprovide/reprovide.go
+10
-6
@@ -7,7 +7,8 @@ import (
7
8
blocks "github.com/jbenet/go-ipfs/blocks/blockstore"
9
routing "github.com/jbenet/go-ipfs/routing"
10
- "github.com/jbenet/go-ipfs/util/eventlog"
10
+ debugerror "github.com/jbenet/go-ipfs/util/debugerror"
11
+ eventlog "github.com/jbenet/go-ipfs/util/eventlog"
12
)
13
14
var log = eventlog.Logger("reprovider")
@@ -34,22 +35,25 @@ func (rp *Reprovider) ProvideEvery(ctx context.Context, tick time.Duration) {
35
case <-ctx.Done():
36
return
37
case <-after:
37
- rp.Reprovide(ctx)
38
+ err := rp.Reprovide(ctx)
39
+ if err != nil {
40
+ log.Error(err)
41
+ }
42
after = time.After(tick)
43
}
44
}
45
}
46
43
-func (rp *Reprovider) Reprovide(ctx context.Context) {
47
+func (rp *Reprovider) Reprovide(ctx context.Context) error {
48
keychan, err := rp.bstore.AllKeysChan(ctx, 0, 1<<16)
49
if err != nil {
46
- log.Errorf("Failed to get key chan from blockstore: %s", err)
47
- return
50
+ return debugerror.Errorf("Failed to get key chan from blockstore: %s", err)
51
}
52
for k := range keychan {
53
err := rp.rsys.Provide(ctx, k)
54
if err != nil {
52
- log.Errorf("Failed to provide key: %s, %s", k, err)
55
+ return debugerror.Errorf("Failed to provide key: %s, %s", k, err)
56
}
57
}
58
+ return nil
59
}
exchange/reprovide/reprovide_test.go
+4
-1
@@ -33,7 +33,10 @@ func TestReprovide(t *testing.T) {
33
bstore.Put(blk)
34
35
reprov := NewReprovider(clA, bstore)
36
- reprov.Reprovide(ctx)
36
+ err := reprov.Reprovide(ctx)
37
+ if err != nil {
38
+ t.Fatal(err)
39
+ }
40
41
provs, err := clB.FindProviders(ctx, blk.Key())
42
if err != nil {