wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fall back to last known HEAD sha if fetch fails

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-11-19 16:14:22 -05:00
parent dd53847211
commit 8872e17f93
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
scripts/speculator/main.go
View file

@ -87,10 +87,6 @@ func gitCheckout(path, sha string) error {
return runGitCommand(path, []string{"checkout", sha}) return runGitCommand(path, []string{"checkout", sha})
} }
func gitFetch(path string) error {
return runGitCommand(path, []string{"fetch"})
}
func runGitCommand(path string, args []string) error { func runGitCommand(path string, args []string) error {
cmd := exec.Command("git", args...) cmd := exec.Command("git", args...)
cmd.Dir = path cmd.Dir = path
@ -148,7 +144,7 @@ type server struct {
func (s *server) updateBase() error { func (s *server) updateBase() error {
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock() defer s.mu.Unlock()
return gitFetch(s.matrixDocCloneURL) return runGitCommand(s.matrixDocCloneURL, []string{"fetch"})
} }
// generateAt generates spec from repo at sha. // generateAt generates spec from repo at sha.
@ -191,16 +187,12 @@ func (s *server) serveSpec(w http.ResponseWriter, req *http.Request) {
var sha string var sha string
if strings.ToLower(req.URL.Path) == "/spec/head" { if strings.ToLower(req.URL.Path) == "/spec/head" {
if err := s.updateBase(); err != nil { if headSha, err := s.lookupHeadSHA(); headSha == "" {
writeError(w, 500, err) writeError(w, 500, err)
return return
} else {
sha = headSha
} }
originHead, err := s.getSHAOf("origin/master")
if err != nil {
writeError(w, 500, err)
return
}
sha = originHead
} else { } else {
pr, err := lookupPullRequest(*req.URL, "/spec") pr, err := lookupPullRequest(*req.URL, "/spec")
if err != nil { if err != nil {
@ -237,6 +229,25 @@ func (s *server) serveSpec(w http.ResponseWriter, req *http.Request) {
specCache.Add(sha, b) specCache.Add(sha, b)
} }
// lookupHeadSHA looks up what origin/master's HEAD SHA is.
// It attempts to `git fetch` before doing so.
// If this fails, it may still return a stale sha, but will also return an error.
func (s *server) lookupHeadSHA() (sha string, retErr error) {
retErr = s.updateBase()
if retErr != nil {
log.Printf("Error fetching: %v, attempting to fall back to current known value", retErr)
}
originHead, err := s.getSHAOf("origin/master")
if err != nil {
retErr = err
}
sha = originHead
if retErr != nil && originHead != "" {
log.Printf("Successfully fell back to possibly stale sha: %s", sha)
}
return
}
func checkAuth(pr *PullRequest) error { func checkAuth(pr *PullRequest) error {
if !pr.User.IsTrusted() { if !pr.User.IsTrusted() {
return fmt.Errorf("%q is not a trusted pull requester", pr.User.Login) return fmt.Errorf("%q is not a trusted pull requester", pr.User.Login)