Skip to content

Commit

Permalink
chore: resolve feedback on lint changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacobheun
jacobheun committed Apr 14, 2023
1 parent 10fbdf4 commit 74ce935
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
22 changes: 11 additions & 11 deletions extern/boostd-data/couchbase/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (s *Store) AddDealForPiece(ctx context.Context, pieceCid cid.Cid, dealInfo
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.add-deal-for-piece", "took", time.Since(now))
log.Debugw("handled.add-deal-for-piece", "took", time.Since(now).String())
}(time.Now())

return s.db.AddDealForPiece(ctx, pieceCid, dealInfo)
Expand All @@ -63,7 +63,7 @@ func (s *Store) SetCarSize(ctx context.Context, pieceCid cid.Cid, size uint64) e
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.set-car-size", "took", time.Since(now))
log.Debugw("handled.set-car-size", "took", time.Since(now).String())
}(time.Now())

err := s.db.SetCarSize(ctx, pieceCid, size)
Expand All @@ -77,7 +77,7 @@ func (s *Store) MarkIndexErrored(ctx context.Context, pieceCid cid.Cid, idxErr s
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.mark-piece-index-errored", "took", time.Since(now))
log.Debugw("handled.mark-piece-index-errored", "took", time.Since(now).String())
}(time.Now())

err := s.db.MarkIndexErrored(ctx, pieceCid, errors.New(idxErr))
Expand All @@ -95,7 +95,7 @@ func (s *Store) GetOffsetSize(ctx context.Context, pieceCid cid.Cid, hash mh.Mul
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-offset-size", "took", time.Since(now))
log.Debugw("handled.get-offset-size", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand All @@ -115,7 +115,7 @@ func (s *Store) GetPieceMetadata(ctx context.Context, pieceCid cid.Cid) (model.M
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-piece-metadata", "took", time.Since(now))
log.Debugw("handled.get-piece-metadata", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand All @@ -134,7 +134,7 @@ func (s *Store) GetPieceDeals(ctx context.Context, pieceCid cid.Cid) ([]model.De
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-piece-deals", "took", time.Since(now))
log.Debugw("handled.get-piece-deals", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand All @@ -154,7 +154,7 @@ func (s *Store) PiecesContainingMultihash(ctx context.Context, m mh.Multihash) (
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.pieces-containing-mh", "took", time.Since(now))
log.Debugw("handled.pieces-containing-mh", "took", time.Since(now).String())
}(time.Now())

pcids, err := s.db.GetPieceCidsByMultihash(ctx, m)
Expand All @@ -168,7 +168,7 @@ func (s *Store) GetIndex(ctx context.Context, pieceCid cid.Cid) ([]model.Record,
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-index", "took", time.Since(now))
log.Debugw("handled.get-index", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand Down Expand Up @@ -203,7 +203,7 @@ func (s *Store) IsCompleteIndex(ctx context.Context, pieceCid cid.Cid) (bool, er
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.is-complete-index", "took", time.Since(now))
log.Debugw("handled.is-complete-index", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand Down Expand Up @@ -255,7 +255,7 @@ func (s *Store) IndexedAt(ctx context.Context, pieceCid cid.Cid) (time.Time, err
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.indexed-at", "took", time.Since(now))
log.Debugw("handled.indexed-at", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand All @@ -273,7 +273,7 @@ func (s *Store) ListPieces(ctx context.Context) ([]cid.Cid, error) {
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.list-pieces", "took", time.Since(now))
log.Debugw("handled.list-pieces", "took", time.Since(now).String())
}(time.Now())

return s.db.ListPieces(ctx)
Expand Down
2 changes: 1 addition & 1 deletion extern/boostd-data/ldb/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ func (db *DB) MarkIndexErrored(ctx context.Context, pieceCid cid.Cid, sourceErr
return nil
}

md.Error = err.Error()
md.Error = sourceErr.Error()
md.ErrorType = fmt.Sprintf("%T", sourceErr)

return db.SetPieceCidToMetadata(ctx, pieceCid, md)
Expand Down
34 changes: 17 additions & 17 deletions extern/boostd-data/ldb/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (s *Store) AddDealForPiece(ctx context.Context, pieceCid cid.Cid, dealInfo
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.add-deal-for-piece", "took", time.Since(now))
log.Debugw("handled.add-deal-for-piece", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand Down Expand Up @@ -128,7 +128,7 @@ func (s *Store) SetCarSize(ctx context.Context, pieceCid cid.Cid, size uint64) e
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.set-car-size", "took", time.Since(now))
log.Debugw("handled.set-car-size", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -145,7 +145,7 @@ func (s *Store) MarkIndexErrored(ctx context.Context, pieceCid cid.Cid, idxErr s
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.mark-piece-index-errored", "took", time.Since(now))
log.Debugw("handled.mark-piece-index-errored", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -166,7 +166,7 @@ func (s *Store) GetOffsetSize(ctx context.Context, pieceCid cid.Cid, hash mh.Mul
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-offset-size", "took", time.Since(now))
log.Debugw("handled.get-offset-size", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -187,7 +187,7 @@ func (s *Store) GetPieceMetadata(ctx context.Context, pieceCid cid.Cid) (model.M
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-piece-metadata", "took", time.Since(now))
log.Debugw("handled.get-piece-metadata", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand All @@ -206,7 +206,7 @@ func (s *Store) GetPieceDeals(ctx context.Context, pieceCid cid.Cid) ([]model.De
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.get-piece-deals", "took", time.Since(now))
log.Debugw("handled.get-piece-deals", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -229,7 +229,7 @@ func (s *Store) PiecesContainingMultihash(ctx context.Context, m mh.Multihash) (
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.pieces-containing-mh", "took", time.Since(now))
log.Debugw("handled.pieces-containing-mh", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -246,7 +246,7 @@ func (s *Store) GetIndex(ctx context.Context, pieceCid cid.Cid) ([]model.Record,
defer span.End()

defer func(now time.Time) {
log.Warnw("handled.get-index", "took", time.Since(now))
log.Warnw("handled.get-index", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand Down Expand Up @@ -283,7 +283,7 @@ func (s *Store) IsCompleteIndex(ctx context.Context, pieceCid cid.Cid) (bool, er
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.is-complete-index", "took", time.Since(now))
log.Debugw("handled.is-complete-index", "took", time.Since(now).String())
}(time.Now())

md, err := s.db.GetPieceCidToMetadata(ctx, pieceCid)
Expand All @@ -301,7 +301,7 @@ func (s *Store) AddIndex(ctx context.Context, pieceCid cid.Cid, records []model.
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.add-index", "took", time.Since(now))
log.Debugw("handled.add-index", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand Down Expand Up @@ -377,7 +377,7 @@ func (s *Store) IndexedAt(ctx context.Context, pieceCid cid.Cid) (time.Time, err
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.indexed-at", "took", time.Since(now))
log.Debugw("handled.indexed-at", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -398,7 +398,7 @@ func (s *Store) ListPieces(ctx context.Context) ([]cid.Cid, error) {
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.list-pieces", "took", time.Since(now))
log.Debugw("handled.list-pieces", "took", time.Since(now).String())
}(time.Now())

return s.db.ListPieces(ctx)
Expand All @@ -409,7 +409,7 @@ func (s *Store) NextPiecesToCheck(ctx context.Context) ([]cid.Cid, error) {
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.next-pieces-to-check", "took", time.Since(now))
log.Debugw("handled.next-pieces-to-check", "took", time.Since(now).String())
}(time.Now())

return s.db.NextPiecesToCheck(ctx)
Expand All @@ -422,7 +422,7 @@ func (s *Store) FlagPiece(ctx context.Context, pieceCid cid.Cid) error {
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.flag-piece", "took", time.Since(now))
log.Debugw("handled.flag-piece", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand Down Expand Up @@ -458,7 +458,7 @@ func (s *Store) UnflagPiece(ctx context.Context, pieceCid cid.Cid) error {
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.unflag-piece", "took", time.Since(now))
log.Debugw("handled.unflag-piece", "took", time.Since(now).String())
}(time.Now())

s.Lock()
Expand All @@ -478,7 +478,7 @@ func (s *Store) FlaggedPiecesList(ctx context.Context, cursor *time.Time, offset
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.flagged-pieces-list", "took", time.Since(now))
log.Debugw("handled.flagged-pieces-list", "took", time.Since(now).String())
}(time.Now())

return s.db.ListFlaggedPieces(ctx)
Expand All @@ -491,7 +491,7 @@ func (s *Store) FlaggedPiecesCount(ctx context.Context) (int, error) {
defer span.End()

defer func(now time.Time) {
log.Debugw("handled.flagged-pieces-count", "took", time.Since(now))
log.Debugw("handled.flagged-pieces-count", "took", time.Since(now).String())
}(time.Now())

return s.db.FlaggedPiecesCount(ctx)
Expand Down

0 comments on commit 74ce935

Please sign in to comment.