blockservice: add BlockedFetched/Added/Removed events
... and remove a few log lines that don't seem terribly useful. License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
Lars Gierth committed
Feb 4, 2018 at 04:28 UTC
038ed8f666a7e9c642ae75093628f5caa740b431
1 file changed
+10
-2
blockservice/blockservice.go
+10
-2
@@ -138,6 +138,8 @@ func (s *blockService) AddBlock(o blocks.Block) error {
138
return err
139
}
140
141
+ log.Event(context.TODO(), "BlockService.BlockAdded", c)
142
+
143
if err := s.exchange.HasBlock(o); err != nil {
144
// TODO(#4623): really an error?
145
return errors.New("blockservice is closed")
@@ -169,6 +171,7 @@ func (s *blockService) AddBlocks(bs []blocks.Block) error {
171
}
172
173
for _, o := range toput {
174
+ log.Event(context.TODO(), "BlockService.BlockAdded", o.Cid())
175
if err := s.exchange.HasBlock(o); err != nil {
176
// TODO(#4623): Should this really *return*?
177
return fmt.Errorf("blockservice is closed (%s)", err)
@@ -207,6 +210,7 @@ func getBlock(ctx context.Context, c *cid.Cid, bs blockstore.Blockstore, f excha
210
}
211
return nil, err
212
}
213
+ log.Event(ctx, "BlockService.BlockFetched", c)
214
return blk, nil
215
}
216
@@ -236,7 +240,6 @@ func getBlocks(ctx context.Context, ks []*cid.Cid, bs blockstore.Blockstore, f e
240
misses = append(misses, c)
241
continue
242
}
239
- log.Debug("Blockservice: Got data in datastore")
243
select {
244
case out <- hit:
245
case <-ctx.Done():
@@ -255,6 +258,7 @@ func getBlocks(ctx context.Context, ks []*cid.Cid, bs blockstore.Blockstore, f e
258
}
259
260
for b := range rblocks {
261
+ log.Event(ctx, "BlockService.BlockFetched", b.Cid())
262
select {
263
case out <- b:
264
case <-ctx.Done():
@@ -267,7 +271,11 @@ func getBlocks(ctx context.Context, ks []*cid.Cid, bs blockstore.Blockstore, f e
271
272
// DeleteBlock deletes a block in the blockservice from the datastore
273
func (s *blockService) DeleteBlock(c *cid.Cid) error {
270
- return s.blockstore.DeleteBlock(c)
274
+ err := s.blockstore.DeleteBlock(c)
275
+ if err == nil {
276
+ log.Event(context.TODO(), "BlockService.BlockDeleted", c)
277
+ }
278
+ return err
279
}
280
281
func (s *blockService) Close() error {