dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respond 200 when receiving a ping event. (#2492)

This commit is contained in:
François de Metz 2017-03-06 12:34:41 +00:00 committed by Cameron Sparr
parent 10744646db
commit 76bcdecd21
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/inputs/webhooks/github/github_webhooks.go
View File

@ -34,9 +34,10 @@ func (gh *GithubWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
if e != nil {
p := e.NewMetric() p := e.NewMetric()
gh.acc.AddFields("github_webhooks", p.Fields(), p.Tags(), p.Time()) gh.acc.AddFields("github_webhooks", p.Fields(), p.Tags(), p.Time())
}
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }
@ -84,6 +85,8 @@ func NewEvent(data []byte, name string) (Event, error) {
return generateEvent(data, &MembershipEvent{}) return generateEvent(data, &MembershipEvent{})
case "page_build": case "page_build":
return generateEvent(data, &PageBuildEvent{}) return generateEvent(data, &PageBuildEvent{})
case "ping":
return nil, nil
case "public": case "public":
return generateEvent(data, &PublicEvent{}) return generateEvent(data, &PublicEvent{})
case "pull_request": case "pull_request":

4
plugins/inputs/webhooks/github/github_webhooks_test.go
View File

@ -25,6 +25,10 @@ func TestCommitCommentEvent(t *testing.T) {
GithubWebhookRequest("commit_comment", CommitCommentEventJSON(), t) GithubWebhookRequest("commit_comment", CommitCommentEventJSON(), t)
} }
func TestPingEvent(t *testing.T) {
GithubWebhookRequest("ping", "", t)
}
func TestDeleteEvent(t *testing.T) { func TestDeleteEvent(t *testing.T) {
GithubWebhookRequest("delete", DeleteEventJSON(), t) GithubWebhookRequest("delete", DeleteEventJSON(), t)
} }