From 8642d7787848bb31795e7892e0204b77dacadf26 Mon Sep 17 00:00:00 2001 From: Marcin Praski Date: Fri, 9 Sep 2022 10:21:40 +0200 Subject: [PATCH] Ensure our error map has hashable keys --- logger/error.go | 4 ++-- logger/logger.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/logger/error.go b/logger/error.go index cc808cb..e547bb5 100644 --- a/logger/error.go +++ b/logger/error.go @@ -13,7 +13,7 @@ type ValidationError struct { Details validator.ValidationErrors } -var errorMap = map[error]int{} +var errorMap = map[string]int{} var ( matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)") @@ -22,7 +22,7 @@ var ( func RegisterErrors(m map[error]int) { for k, v := range m { - errorMap[k] = v + errorMap[k.Error()] = v } } diff --git a/logger/logger.go b/logger/logger.go index 390865b..f5039cd 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -64,7 +64,7 @@ func (l Logger) LogServiceError(w http.ResponseWriter, r *http.Request, e error) f []apiField ) - if v, ok := errorMap[u]; ok { + if v, ok := errorMap[m]; ok { s = v } @@ -76,7 +76,7 @@ func (l Logger) LogServiceError(w http.ResponseWriter, r *http.Request, e error) n := unwrap(g.Root) m = n.Error() - if v, ok := errorMap[n]; ok { + if v, ok := errorMap[m]; ok { s = v } }