ref: 6258d48b0220fa59edf50a32031677eb7b7944d4
parent: c42982f76b397a5875114b59391712048e168348
author: srinivasreddy <[email protected]>
date: Sat Mar 12 19:49:53 EST 2016
Utils methods refactored for readability
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -20,35 +20,37 @@
)
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)
}
- os.Exit(-1)
+ }
+ for _, message := range s {+ if message != "" {+ jww.CRITICAL.Println(message)
+ }
}
}