From 956589fab3d67fb5ce9823b7d7c5d8201b7a95f7 Mon Sep 17 00:00:00 2001 From: Cameron Moore Date: Thu, 19 Mar 2015 09:21:15 -0500 Subject: [PATCH 1/2] Improve placement of variable declaration Thanks to rsc.io/grind --- helpers/helpers.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/helpers/helpers.go b/helpers/helpers.go index a6c02bf..c5bbed7 100644 --- a/helpers/helpers.go +++ b/helpers/helpers.go @@ -42,12 +42,10 @@ func ExtractParameter(s string, params interface{}) (string, bool) { return "", false } - var p []string - if paramsValue := reflect.ValueOf(params); paramsValue.Kind() == reflect.Slice { if paramsValueSliceLength := paramsValue.Len(); paramsValueSliceLength > 0 { - if p = strings.SplitN(s, ".", 3); len(p) > 3 { + if p := strings.SplitN(s, ".", 3); len(p) > 3 { index, err := strconv.ParseInt(p[1], 10, 64) if err != nil { @@ -63,7 +61,7 @@ func ExtractParameter(s string, params interface{}) (string, bool) { return "", false } - if p = strings.SplitN(s, ".", 2); len(p) > 1 { + if p := strings.SplitN(s, ".", 2); len(p) > 1 { if pValue, ok := params.(map[string]interface{})[p[0]]; ok { return ExtractParameter(p[1], pValue) } From e9aaeb579ea4e71617d036a3ee401a024089feb5 Mon Sep 17 00:00:00 2001 From: Cameron Moore Date: Thu, 19 Mar 2015 09:23:47 -0500 Subject: [PATCH 2/2] Rework negroni Logger creation From `go vet`: webhook.go:98: github.com/codegangsta/negroni.Logger composite literal uses unkeyed fields --- webhook.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/webhook.go b/webhook.go index 0b445a9..0bf870a 100644 --- a/webhook.go +++ b/webhook.go @@ -93,18 +93,17 @@ func main() { } } - l := log.New(os.Stdout, "[webhook] ", log.Ldate|log.Ltime) - - negroniLogger := &negroni.Logger{l} + l := negroni.NewLogger() + l.Logger = log.New(os.Stdout, "[webhook] ", log.Ldate|log.Ltime) negroniRecovery := &negroni.Recovery{ - Logger: l, + Logger: l.Logger, PrintStack: true, StackAll: false, StackSize: 1024 * 8, } - n := negroni.New(negroniRecovery, negroniLogger) + n := negroni.New(negroniRecovery, l) router := mux.NewRouter()