From 48061f150832170a7baf4a686b87d44a74f350de Mon Sep 17 00:00:00 2001 From: Cameron Moore Date: Fri, 16 Feb 2018 20:23:25 -0600 Subject: [PATCH] Simplify boolean some comparisons --- hook/hook.go | 4 ++-- webhook.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hook/hook.go b/hook/hook.go index fb1b6fc..434d7f7 100644 --- a/hook/hook.go +++ b/hook/hook.go @@ -687,7 +687,7 @@ func (r AndRule) Evaluate(headers, query, payload *map[string]interface{}, body } res = res && rv - if res == false { + if !res { return res, nil } } @@ -709,7 +709,7 @@ func (r OrRule) Evaluate(headers, query, payload *map[string]interface{}, body * } res = res || rv - if res == true { + if res { return res, nil } } diff --git a/webhook.go b/webhook.go index e8a9c00..3014b1c 100644 --- a/webhook.go +++ b/webhook.go @@ -120,7 +120,7 @@ func main() { newHooksFiles := hooksFiles[:0] for _, filePath := range hooksFiles { - if _, ok := loadedHooksFromFiles[filePath]; ok == true { + if _, ok := loadedHooksFromFiles[filePath]; ok { newHooksFiles = append(newHooksFiles, filePath) } } @@ -436,7 +436,7 @@ func reloadHooks(hooksFilePath string) { } } - if (matchLoadedHook(hook.ID) != nil && !wasHookIDAlreadyLoaded) || seenHooksIds[hook.ID] == true { + if (matchLoadedHook(hook.ID) != nil && !wasHookIDAlreadyLoaded) || seenHooksIds[hook.ID] { log.Printf("error: hook with the id %s has already been loaded!\nplease check your hooks file for duplicate hooks ids!", hook.ID) log.Println("reverting hooks back to the previous configuration") return