Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "buildbot: be more patient when waiting for camlistored"

This commit is contained in:
mpl 2014-07-06 00:40:15 +00:00 committed by Gerrit Code Review
parent 90cb6a84fb c23933efdc
commit cc6dc2a3cb
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
misc/buildbot/builder/builder.go
View File

@ -45,12 +45,14 @@ import (
"syscall" "syscall"
"time" "time"
"camlistore.org/pkg/netutil"
"camlistore.org/pkg/osutil" "camlistore.org/pkg/osutil"
) )
const ( const (
interval = 60 * time.Second // polling frequency interval = 60 * time.Second // polling frequency
warmup = 30 * time.Second // duration before we test if devcam server has started properly warmup = 30 * time.Second // duration before we test if devcam server has started properly
camlistoredTimeOut = time.Minute // how long we try to dial camlistored after warmup
) )
var ( var (
@ -841,8 +843,8 @@ func hitCamliUi() error {
return nil return nil
} }
func hitURL(url string) (err error) { func hitURL(uri string) (err error) {
tsk := newTask("http.Get", url) tsk := newTask("http.Get", uri)
defer func() { defer func() {
if err != nil { if err != nil {
tsk.Err = fmt.Sprintf("%v", err) tsk.Err = fmt.Sprintf("%v", err)
@ -853,8 +855,17 @@ func hitURL(url string) (err error) {
}() }()
dbg.Println(tsk.String()) dbg.Println(tsk.String())
tsk.Start = time.Now() tsk.Start = time.Now()
u, err := url.Parse(uri)
if err != nil {
return fmt.Errorf("%v: could not get host:port to dial from %v: %v\n", tsk.String(), uri, err)
}
hostPort := u.Host
err = netutil.AwaitReachable(hostPort, camlistoredTimeOut)
if err != nil {
return fmt.Errorf("%v: camlistored unreachable at %v after %v: %v\n", tsk.String(), hostPort, camlistoredTimeOut, err)
}
var resp *http.Response var resp *http.Response
resp, err = http.Get(url) resp, err = http.Get(uri)
if err != nil { if err != nil {
return fmt.Errorf("%v: %v\n", tsk.String(), err) return fmt.Errorf("%v: %v\n", tsk.String(), err)
} }