mirrors/webhook
1
0
Fork 0
mirror of https://github.com/adnanh/webhook.git synced 2025-05-23 22:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add global HTTP methods to starting log message

Browse source
This commit is contained in:
Cameron Moore 2019-12-26 15:17:01 -06:00
parent a03e812615
commit e1249a9ddb
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
webhook.go
View file

@ -204,15 +204,17 @@ func main() {
fmt.Fprint(w, "OK") fmt.Fprint(w, "OK")
}) })
var allowedMethods []string
if *httpMethods == "" { if *httpMethods == "" {
r.HandleFunc(hooksURL, hookHandler) r.HandleFunc(hooksURL, hookHandler)
} else { } else {
allowed := strings.Split(*httpMethods, ",") allowedMethods = strings.Split(*httpMethods, ",")
for i := range allowed { for i := range allowedMethods {
allowed[i] = strings.TrimSpace(allowed[i]) allowedMethods[i] = strings.TrimSpace(allowedMethods[i])
} }
r.HandleFunc(hooksURL, hookHandler).Methods(allowed...) r.HandleFunc(hooksURL, hookHandler).Methods(allowedMethods...)
} }
addr := fmt.Sprintf("%s:%d", *ip, *port) addr := fmt.Sprintf("%s:%d", *ip, *port)
@ -240,7 +242,12 @@ func main() {
// Serve HTTP // Serve HTTP
if !*secure { if !*secure {
if len(allowedMethods) == 0 {
log.Printf("serving hooks on http://%s%s", addr, hooksURL) log.Printf("serving hooks on http://%s%s", addr, hooksURL)
} else {
log.Printf("serving hooks on http://%s%s for %s", addr, hooksURL, strings.Join(allowedMethods, ", "))
}
log.Print(svr.Serve(ln)) log.Print(svr.Serve(ln))
return return
} }
@ -254,7 +261,11 @@ func main() {
} }
svr.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler)) // disable http/2 svr.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler)) // disable http/2
if len(allowedMethods) == 0 {
log.Printf("serving hooks on https://%s%s", addr, hooksURL) log.Printf("serving hooks on https://%s%s", addr, hooksURL)
} else {
log.Printf("serving hooks on https://%s%s for %s", addr, hooksURL, strings.Join(allowedMethods, ", "))
}
log.Print(svr.ServeTLS(ln, *cert, *key)) log.Print(svr.ServeTLS(ln, *cert, *key))
} }