From 363a5359bdd4e35bd3398e1567265e8e1e057c12 Mon Sep 17 00:00:00 2001 From: Adnan Hajdarevic Date: Tue, 13 Jan 2015 02:12:19 +0100 Subject: [PATCH] refactoring --- hooks.json.example | 43 +++++++++---------------------------------- webhook.go | 2 +- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/hooks.json.example b/hooks.json.example index 9f147a6..a76bb3a 100644 --- a/hooks.json.example +++ b/hooks.json.example @@ -1,39 +1,14 @@ [ { - "id": "draos", - "command": "dir", - "secret": "", - "trigger-rule": { - "and": [ - { - "match": { - "parameter": "commits.100.id", - "value": "20c16a7055dae65c69b9ca3f2e8cd1ac8fe9bbf2" - } - }, - { - "match": { - "parameter": "ref", - "value": "refs/heads/master" - } - }, - { - "match": { - "parameter": "repository.id", - "value": "17341098" - } - } - ] - } - }, - { - "id": "something", - "command": "", - "cwd": ".", - "trigger-rule": { - "match": { - "parameter": "second", - "value": "2" + "id": "webhook", + "command": "/home/adnan/redeploy-go-webhook.sh", + "cwd": "/home/adnan/go", + "trigger-rule": + { + "match": + { + "parameter": "ref", + "value": "refs/heads/master" } } } diff --git a/webhook.go b/webhook.go index 67224db..27327d5 100644 --- a/webhook.go +++ b/webhook.go @@ -74,7 +74,7 @@ func hookHandler(req *http.Request, params martini.Params) string { err := decoder.Decode(&p) if err != nil { - l4g.Warn("Error occurred while trying to parse the payload as JSON") + l4g.Warn("Error occurred while trying to parse the payload as JSON: %s", err) } }