diff options
-rw-r--r-- | utils/utils.go | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/utils/utils.go b/utils/utils.go index 3977a0e62..6f4264cca 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -20,35 +20,37 @@ import ( ) func CheckErr(err error, s ...string) { - if err != nil { - if len(s) == 0 { - jww.CRITICAL.Println(err) - } else { - for _, message := range s { - jww.ERROR.Println(message) - } - jww.ERROR.Println(err) - } + if err == nil { + return + } + if len(s) == 0 { + jww.CRITICAL.Println(err) + return } + for _, message := range s { + jww.ERROR.Println(message) + } + jww.ERROR.Println(err) } func StopOnErr(err error, s ...string) { - if err != nil { - if len(s) == 0 { - newMessage := err.Error() + if err == nil { + return + } - // Printing an empty string results in a error with - // no message, no bueno. - if newMessage != "" { - jww.CRITICAL.Println(newMessage) - } - } else { - for _, message := range s { - if message != "" { - jww.CRITICAL.Println(message) - } - } + defer os.Exit(-1) + + if len(s) == 0 { + newMessage := err.Error() + // Printing an empty string results in a error with + // no message, no bueno. + if newMessage != "" { + jww.CRITICAL.Println(newMessage) + } + } + for _, message := range s { + if message != "" { + jww.CRITICAL.Println(message) } - os.Exit(-1) } } |