TrueCloudLab
/
frostfs-s3-gw
16
2
Fork 14
Code Issues 19 Pull Requests 4 Actions Packages Releases 6 Activity

[#551] Refactor notifications logs 

Signed-off-by: Denis Kirillov <denis@nspcc.ru>
remotes/KirillovDenis/bugfix/681-fix_acl_parsing
Denis Kirillov 2022-06-24 17:34:44 +03:00 committed by Alex Vanin
parent e84ff96593
commit f72bc538b9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/handler/api.go
View File

@ -44,7 +44,9 @@ func New(log *zap.Logger, obj layer.Client, notificator Notificator, cfg *Config
return nil, errors.New("empty logger")
}
if cfg.NotificatorEnabled && notificator == nil {
if !cfg.NotificatorEnabled {
log.Warn("notificator is disabled, s3 won't produce notification events")
} else if notificator == nil {
return nil, errors.New("empty notificator")
}

2
api/handler/notifications.go
View File

@ -13,7 +13,6 @@ import (
"github.com/nspcc-dev/neofs-s3-gw/api/errors"
"github.com/nspcc-dev/neofs-s3-gw/api/layer"
"github.com/nspcc-dev/neofs-sdk-go/bearer"
"go.uber.org/zap"
)
type (
@ -148,7 +147,6 @@ func (h *handler) GetBucketNotificationHandler(w http.ResponseWriter, r *http.Re
func (h *handler) sendNotifications(ctx context.Context, p *SendNotificationParams) error {
if !h.cfg.NotificatorEnabled {
h.log.Debug("could not send notification because notificator is disabled", zap.String("event", p.Event))
return nil
}