From 423e0d6450f73b1ae51017c1a4bcb8382a8ff202 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 30 Sep 2021 15:31:00 +0200 Subject: [PATCH] remove named return and add loggin --- storage/pkg/command/gateway.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go index f5865be5db..8c550a19eb 100644 --- a/storage/pkg/command/gateway.go +++ b/storage/pkg/command/gateway.go @@ -228,7 +228,7 @@ func rules(cfg *config.Config, logger log.Logger) map[string]map[string]interfac } } -func mimetypes(cfg *config.Config, logger log.Logger) (m map[string]map[string]string) { +func mimetypes(cfg *config.Config, logger log.Logger) map[string]map[string]string { type mimeTypeConfig struct { Extension string `json:"extension" mapstructure:"extension"` @@ -252,7 +252,9 @@ func mimetypes(cfg *config.Config, logger log.Logger) (m map[string]map[string]s logger.Error().Err(err).Msg("Failed to unmarshal storage registry rules") return nil } + var m map[string]map[string]string if err := mapstructure.Decode(mimetypes, &m); err != nil { + logger.Error().Err(err).Msg("Failed to decode defaultapp registry mimetypes to mapstructure") return nil } return m @@ -333,7 +335,9 @@ func mimetypes(cfg *config.Config, logger log.Logger) (m map[string]map[string]s }, } + var m map[string]map[string]string if err := mapstructure.Decode(mimetypes, &m); err != nil { + logger.Error().Err(err).Msg("Failed to decode defaultapp registry mimetypes to mapstructure") return nil } return m