@@ -223,16 +223,23 @@ type RecursiveLister struct {
223223}
224224
225225func NewRecursiveLister (logger log.Logger , bkt objstore.InstrumentedBucketReader ) * RecursiveLister {
226- level .Info (logger ).Log ("msg" , "Using recursive block lister" )
226+ if logger != nil {
227+ level .Info (logger ).Log ("msg" , "Using recursive block lister" )
228+ }
227229 return & RecursiveLister {
228230 logger : logger ,
229231 bkt : bkt ,
230232 }
231233}
232234
233235func (f * RecursiveLister ) GetActiveAndPartialBlockIDs (ctx context.Context , ch chan <- ulid.ULID ) (partialBlocks map [ulid.ULID ]bool , err error ) {
234- level .Info (f .logger ).Log ("msg" , "recursive block lister started" )
235- start := time .Now ()
236+ if f .logger != nil {
237+ level .Info (f .logger ).Log ("msg" , "recursive block lister started" )
238+ start := time .Now ()
239+ defer func () {
240+ level .Info (f .logger ).Log ("msg" , "recursive block lister ended" , "duration" , time .Since (start ))
241+ }()
242+ }
236243 partialBlocks = make (map [ulid.ULID ]bool )
237244 err = f .bkt .Iter (ctx , "" , func (name string ) error {
238245 parts := strings .Split (name , "/" )
@@ -256,7 +263,6 @@ func (f *RecursiveLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch ch
256263 }
257264 return nil
258265 }, objstore .WithRecursiveIter ())
259- level .Info (f .logger ).Log ("msg" , "recursive block lister ended" , "duration" , time .Since (start ))
260266 return partialBlocks , err
261267}
262268
@@ -268,19 +274,23 @@ type ConcurrentLister struct {
268274}
269275
270276func NewConcurrentLister (logger log.Logger , bkt objstore.InstrumentedBucketReader ) * ConcurrentLister {
271- level .Info (logger ).Log ("msg" , "Using concurrent block lister" )
277+ if logger != nil {
278+ level .Info (logger ).Log ("msg" , "Using concurrent block lister" )
279+ }
272280 return & ConcurrentLister {
273281 logger : logger ,
274282 bkt : bkt ,
275283 }
276284}
277285
278286func (f * ConcurrentLister ) GetActiveAndPartialBlockIDs (ctx context.Context , ch chan <- ulid.ULID ) (partialBlocks map [ulid.ULID ]bool , err error ) {
279- level .Info (f .logger ).Log ("msg" , "concurrent block lister started" )
280- start := time .Now ()
281- defer func () {
282- level .Info (f .logger ).Log ("msg" , "concurrent block lister end" , "duration" , time .Since (start ))
283- }()
287+ if f .logger != nil {
288+ level .Info (f .logger ).Log ("msg" , "concurrent block lister started" )
289+ start := time .Now ()
290+ defer func () {
291+ level .Info (f .logger ).Log ("msg" , "concurrent block lister end" , "duration" , time .Since (start ))
292+ }()
293+ }
284294 const concurrency = 64
285295
286296 partialBlocks = make (map [ulid.ULID ]bool )
0 commit comments