From 6149bca5ab4f07dbe9fd38f93995dfc9d1fff92e Mon Sep 17 00:00:00 2001 From: Nicolas Carlier Date: Thu, 25 Sep 2014 09:42:13 +0000 Subject: [PATCH] fix: Improve error logs. --- src/hook/hook_factory.go | 2 +- src/webhookd.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/hook/hook_factory.go b/src/hook/hook_factory.go index 74f1dd7..ee1266c 100644 --- a/src/hook/hook_factory.go +++ b/src/hook/hook_factory.go @@ -18,6 +18,6 @@ func RecordFactory(hookname string) (Record, error) { case "docker": return new(DockerRecord), nil default: - return nil, errors.New("Unknown hookname.") + return nil, errors.New("Unknown hookname: " + hookname) } } diff --git a/src/webhookd.go b/src/webhookd.go index 5c6c2af..87741b3 100644 --- a/src/webhookd.go +++ b/src/webhookd.go @@ -96,17 +96,19 @@ func Handler(w http.ResponseWriter, r *http.Request) { context.Hook = params["hookname"] context.Action = params["action"] - log.Println("Hook name: ", context.Hook) - var record, err = hook.RecordFactory(context.Hook) if err != nil { + log.Println(err.Error()) http.Error(w, err.Error(), http.StatusNotFound) return } + log.Println("Using hook: ", context.Hook) + decoder := json.NewDecoder(r.Body) err = decoder.Decode(&record) if err != nil { + log.Println(err.Error()) http.Error(w, err.Error(), http.StatusBadRequest) return }