Skip to content

Commit 97d9e50

Browse files
committed
notify: fixup more %T warnings
1 parent 80739dd commit 97d9e50

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

internal/notify/multi.go

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,26 @@ func setupBackoff(cfg *service.NotificationRetries) (retry.Backoff, error) {
7373
return fib, nil
7474
}
7575

76+
func senderType(input Sender) string {
77+
if input == nil {
78+
return ""
79+
}
80+
81+
// Get the type of each sender
82+
typeName := reflect.TypeOf(input).Name()
83+
if typeName == "" {
84+
// Handle pointer types by getting the element type
85+
if reflect.TypeOf(input).Kind() == reflect.Ptr {
86+
typeName = reflect.TypeOf(input).Elem().Name()
87+
}
88+
}
89+
return typeName
90+
}
91+
7692
func (ms *MultiSender) senderTypes() string {
7793
out := make([]string, len(ms.senders))
78-
for i, sender := range ms.senders {
79-
// Get the type of each sender
80-
typeName := reflect.TypeOf(sender).Name()
81-
if typeName == "" {
82-
// Handle pointer types by getting the element type
83-
if reflect.TypeOf(sender).Kind() == reflect.Ptr {
84-
typeName = reflect.TypeOf(sender).Elem().Name()
85-
}
86-
}
87-
out[i] = typeName
94+
for i := range ms.senders {
95+
out[i] = senderType(ms.senders[i])
8896
}
8997
return strings.Join(out, ", ")
9098
}
@@ -96,7 +104,7 @@ func (ms *MultiSender) Info(ctx context.Context, msg *Message) error {
96104
return ms.senders[i].Info(ctx, msg)
97105
})
98106
if err != nil {
99-
ms.logger.Logf("multi-sender: Info %T: %v", ms.senders[i], err)
107+
ms.logger.Logf("multi-sender: Info %v: %v", senderType(ms.senders[i]), err)
100108
if firstError == nil {
101109
firstError = err
102110
}
@@ -115,7 +123,7 @@ func (ms *MultiSender) Critical(ctx context.Context, msg *Message) error {
115123
return ms.senders[i].Critical(ctx, msg)
116124
})
117125
if err != nil {
118-
ms.logger.Logf("multi-sender: Critical %T: %v", ms.senders[i], err)
126+
ms.logger.Logf("multi-sender: Critical %v: %v", senderType(ms.senders[i]), err)
119127
if firstError == nil {
120128
firstError = err
121129
}

0 commit comments

Comments
 (0)