github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-09 14:46:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Git: fix for data races.

Browse Source
This commit is contained in:
Abiola Ibrahim
2015-06-07 20:31:34 +01:00
parent 995a2ea618
commit c42e60a3d2
7 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
middleware/git/webhook/github_hook.go
View File

@ -6,12 +6,12 @@ import (
"encoding/hex"
"encoding/json"
"errors"
"github.com/mholt/caddy/middleware/git"
"io/ioutil"
"log"
"net/http"
"os"
"strings"
"github.com/mholt/caddy/middleware/git"
)
type GithubHook struct{}
@ -28,15 +28,9 @@ type ghPush struct {
Ref string `json:"ref"`
}
// Logger is used to log errors; if nil, the default log.Logger is used.
var Logger *log.Logger
// logger is an helper function to retrieve the available logger
func logger() *log.Logger {
if Logger == nil {
Logger = log.New(os.Stderr, "", log.LstdFlags)
}
return Logger
return git.Logger()
}
func (g GithubHook) DoesHandle(h http.Header) bool {
@ -97,7 +91,7 @@ func (g GithubHook) handleSignature(r *http.Request, body []byte, secret string)
signature := r.Header.Get("X-Hub-Signature")
if signature != "" {
if secret == "" {
logger().Print("Unable to verify request signature. Secret not set in caddyfile!")
logger().Print("Unable to verify request signature. Secret not set in caddyfile!\n")
} else {
mac := hmac.New(sha1.New, []byte(secret))
mac.Write(body)
@ -129,7 +123,7 @@ func (g GithubHook) handlePush(body []byte, repo *git.Repo) error {
branch := refSlice[2]
if branch == repo.Branch {
logger().Print("Received pull notification for the tracking branch, updating...")
logger().Print("Received pull notification for the tracking branch, updating...\n")
repo.Pull()
}
@ -148,7 +142,7 @@ func (g GithubHook) handleRelease(body []byte, repo *git.Repo) error {
return errors.New("The release request contained an invalid TagName.")
}
logger().Printf("Received new release '%s'. -> Updating local repository to this release.", release.Release.Name)
logger().Printf("Received new release '%s'. -> Updating local repository to this release.\n", release.Release.Name)
// Update the local branch to the release tag name
// this will pull the release tag.