diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index f35ceb699..9d30f6dc7 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -2417,7 +2417,7 @@ func getServerInfo(ctx context.Context, pools, metrics bool, r *http.Request) ma Mode: string(mode), Domain: domain, Region: globalSite.Region(), - SQSARN: globalEventNotifier.GetARNList(false), + SQSARN: globalEventNotifier.GetARNList(), DeploymentID: globalDeploymentID(), Buckets: buckets, Objects: objects, diff --git a/cmd/event-notification.go b/cmd/event-notification.go index c113706f8..7089df75e 100644 --- a/cmd/event-notification.go +++ b/cmd/event-notification.go @@ -49,23 +49,18 @@ func NewEventNotifier(ctx context.Context) *EventNotifier { } // GetARNList - returns available ARNs. -func (evnot *EventNotifier) GetARNList(onlyActive bool) []string { +func (evnot *EventNotifier) GetARNList() []string { arns := []string{} if evnot == nil { return arns } region := globalSite.Region() - for targetID, target := range evnot.targetList.TargetMap() { + for targetID := range evnot.targetList.TargetMap() { // httpclient target is part of ListenNotification // which doesn't need to be listed as part of the ARN list // This list is only meant for external targets, filter // this out pro-actively. if !strings.HasPrefix(targetID.ID, "httpclient+") { - if onlyActive { - if _, err := target.IsActive(); err != nil { - continue - } - } arns = append(arns, targetID.ToARN(region).String()) } } diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go index b38ca3230..5e49a7c49 100644 --- a/cmd/server-startup-msg.go +++ b/cmd/server-startup-msg.go @@ -158,7 +158,7 @@ func printEventNotifiers() { return } - arns := globalEventNotifier.GetARNList(true) + arns := globalEventNotifier.GetARNList() if len(arns) == 0 { return }