From 978b9b3eea99d58ad95692c35be15e27608a16ee Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 12 Dec 2022 13:21:32 +0100 Subject: Log: Simplify GetErrorLevel --- internal/log/log.go | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/internal/log/log.go b/internal/log/log.go index 99d9f79..68313f7 100644 --- a/internal/log/log.go +++ b/internal/log/log.go @@ -23,27 +23,18 @@ const ( ) func GetErrorLevel(err error) ErrLevel { - if err == nil { - return ErrOther - } - - getLevel := func(e error) ErrLevel { - if e == nil { - return ErrOther - } - - switch e.(type) { - case *oauth.CancelledCallbackError: - return ErrInfo - default: - return ErrOther - } + // Get the inner error + e := err + if err1, ok := err.(*errors.Error); ok { + e = err1.Err } - if err1, ok := err.(*errors.Error); ok { - return getLevel(err1.Err) + switch e.(type) { + case *oauth.CancelledCallbackError: + return ErrInfo + default: + return ErrOther } - return getLevel(err) } // FileLogger defines the type of logger that this package implements -- cgit v1.2.3