mirror of
https://github.com/golang/go
synced 2024-10-01 07:38:32 -06:00
dashboard/builder: minor fixes and enhancements
- do not print secret key - log app responses - allow to customize go repo R=adg, bradfitz CC=golang-dev https://golang.org/cl/29990046
This commit is contained in:
parent
007f41d43e
commit
1dd13c2478
@ -27,7 +27,7 @@ func dash(meth, cmd string, args url.Values, req, resp interface{}) error {
|
|||||||
var r *http.Response
|
var r *http.Response
|
||||||
var err error
|
var err error
|
||||||
if *verbose {
|
if *verbose {
|
||||||
log.Println("dash", meth, cmd, args, req)
|
log.Println("dash <-", meth, cmd, args, req)
|
||||||
}
|
}
|
||||||
cmd = "http://" + *dashboard + "/" + cmd
|
cmd = "http://" + *dashboard + "/" + cmd
|
||||||
if len(args) > 0 {
|
if len(args) > 0 {
|
||||||
@ -79,6 +79,9 @@ func dash(meth, cmd string, args url.Values, req, resp interface{}) error {
|
|||||||
log.Printf("json unmarshal %#q: %s\n", body.Bytes(), err)
|
log.Printf("json unmarshal %#q: %s\n", body.Bytes(), err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if *verbose {
|
||||||
|
log.Println("dash ->", result)
|
||||||
|
}
|
||||||
if result.Error != "" {
|
if result.Error != "" {
|
||||||
return errors.New(result.Error)
|
return errors.New(result.Error)
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ import (
|
|||||||
const (
|
const (
|
||||||
codeProject = "go"
|
codeProject = "go"
|
||||||
codePyScript = "misc/dashboard/googlecode_upload.py"
|
codePyScript = "misc/dashboard/googlecode_upload.py"
|
||||||
goImportPath = "code.google.com/p/go"
|
|
||||||
gofrontendImportPath = "code.google.com/p/gofrontend"
|
gofrontendImportPath = "code.google.com/p/gofrontend"
|
||||||
mkdirPerm = 0750
|
mkdirPerm = 0750
|
||||||
waitInterval = 30 * time.Second // time to wait before checking for new revs
|
waitInterval = 30 * time.Second // time to wait before checking for new revs
|
||||||
@ -46,6 +45,7 @@ var (
|
|||||||
buildRevision = flag.String("rev", "", "Build specified revision and exit")
|
buildRevision = flag.String("rev", "", "Build specified revision and exit")
|
||||||
buildCmd = flag.String("cmd", filepath.Join(".", allCmd), "Build command (specify relative to go/src/)")
|
buildCmd = flag.String("cmd", filepath.Join(".", allCmd), "Build command (specify relative to go/src/)")
|
||||||
buildTool = flag.String("tool", "go", "Tool to build.")
|
buildTool = flag.String("tool", "go", "Tool to build.")
|
||||||
|
gcPath = flag.String("gcpath", "code.google.com/p/go", "Path to download gc from")
|
||||||
gccPath = flag.String("gccpath", "svn://gcc.gnu.org/svn/gcc/trunk", "Path to download gcc from")
|
gccPath = flag.String("gccpath", "svn://gcc.gnu.org/svn/gcc/trunk", "Path to download gcc from")
|
||||||
failAll = flag.Bool("fail", false, "fail all builds")
|
failAll = flag.Bool("fail", false, "fail all builds")
|
||||||
parallel = flag.Bool("parallel", false, "Build multiple targets in parallel")
|
parallel = flag.Bool("parallel", false, "Build multiple targets in parallel")
|
||||||
@ -451,7 +451,7 @@ func (b *Builder) buildSubrepo(goRoot, goPath, pkg, hash string) (string, error)
|
|||||||
func repoForTool() (*vcs.RepoRoot, error) {
|
func repoForTool() (*vcs.RepoRoot, error) {
|
||||||
switch *buildTool {
|
switch *buildTool {
|
||||||
case "go":
|
case "go":
|
||||||
return vcs.RepoRootForImportPath(goImportPath, *verbose)
|
return vcs.RepoRootForImportPath(*gcPath, *verbose)
|
||||||
case "gccgo":
|
case "gccgo":
|
||||||
return vcs.RepoRootForImportPath(gofrontendImportPath, *verbose)
|
return vcs.RepoRootForImportPath(gofrontendImportPath, *verbose)
|
||||||
default:
|
default:
|
||||||
@ -538,7 +538,7 @@ func commitPoll(repo *Repo, pkg, key string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pass 1. Fill in parents and add new log entries to logsByHash.
|
// Pass 1. Fill in parents and add new log entries to logByHash.
|
||||||
// Empty parent means take parent from next log entry.
|
// Empty parent means take parent from next log entry.
|
||||||
// Non-empty parent has form 1234:hashhashhash; we want full hash.
|
// Non-empty parent has form 1234:hashhashhash; we want full hash.
|
||||||
for i := range logs {
|
for i := range logs {
|
||||||
@ -596,7 +596,7 @@ func addCommit(pkg, hash, key string) bool {
|
|||||||
|
|
||||||
// Create commit.
|
// Create commit.
|
||||||
if err := postCommit(key, pkg, l); err != nil {
|
if err := postCommit(key, pkg, l); err != nil {
|
||||||
log.Printf("failed to add %s to dashboard: %v", key, err)
|
log.Printf("failed to add %s to dashboard: %v", hash, err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
|
Loading…
Reference in New Issue
Block a user