Skip to content

Commit e83daf7

Browse files
zeripathguillep2k
andauthored
Avoid logging []byte in queue failures - convert to string first (#10865)
Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: guillep2k <[email protected]>
1 parent 61f603c commit e83daf7

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

modules/queue/queue_wrapped.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,17 @@ func (q *delayedStarter) setInternal(atShutdown func(context.Context, func()), h
6464
break
6565
}
6666
if err.Error() != "resource temporarily unavailable" {
67-
log.Warn("[Attempt: %d] Failed to create queue: %v for %s cfg: %#v error: %v", i, q.underlying, q.name, q.cfg, err)
67+
if bs, ok := q.cfg.([]byte); ok {
68+
log.Warn("[Attempt: %d] Failed to create queue: %v for %s cfg: %s error: %v", i, q.underlying, q.name, string(bs), err)
69+
} else {
70+
log.Warn("[Attempt: %d] Failed to create queue: %v for %s cfg: %#v error: %v", i, q.underlying, q.name, q.cfg, err)
71+
}
6872
}
6973
i++
7074
if q.maxAttempts > 0 && i > q.maxAttempts {
75+
if bs, ok := q.cfg.([]byte); ok {
76+
return fmt.Errorf("Unable to create queue %v for %s with cfg %s by max attempts: error: %v", q.underlying, q.name, string(bs), err)
77+
}
7178
return fmt.Errorf("Unable to create queue %v for %s with cfg %#v by max attempts: error: %v", q.underlying, q.name, q.cfg, err)
7279
}
7380
sleepTime := 100 * time.Millisecond

0 commit comments

Comments
 (0)