misc/dashboard/app: add debug logging to notifyOnFailure; remove unused Result.OK...

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/6258064

diff --git a/misc/dashboard/app/build/build.go b/misc/dashboard/app/build/build.go
index fa3fe299b85420f70b384d1b2c6710b0842cec9b..52f9fb0d4af23fba8cd674e8afc79f7d7770f0df 100644 (file)
--- a/misc/dashboard/app/build/build.go
+++ b/misc/dashboard/app/build/build.go
@@ -168,15 +168,6 @@ func partsToHash(c *Commit, p []string) *Result {
        }
 }
 
-// OK returns the Commit's build state for a specific builder and goHash.
-func (c *Commit) OK(builder, goHash string) (ok, present bool) {
-       r := c.Result(builder, goHash)
-       if r == nil {
-               return false, false
-       }
-       return r.OK, true
-}
-
 // A Result describes a build result for a Commit on an OS/architecture.
 //
 // Each Result entity is a descendant of its associated Commit entity.

diff --git a/misc/dashboard/app/build/notify.go b/misc/dashboard/app/build/notify.go
index e02344ca82b5a5eb98a4ed21b8d373cba0a9d32f..f4c6733598b728276ca0858df4899f0573279de0 100644 (file)
--- a/misc/dashboard/app/build/notify.go
+++ b/misc/dashboard/app/build/notify.go
@@ -37,12 +37,12 @@ func notifyOnFailure(c appengine.Context, com *Commit, builder string) error {
 
        p := &Package{Path: com.PackagePath}
        var broken *Commit
-       ok, present := com.OK(builder, "")
-       if !present {
+       cr := com.Result(builder, "")
+       if cr == nil {
                return fmt.Errorf("no result for %s/%s", com.Hash, builder)
        }
        q := datastore.NewQuery("Commit").Ancestor(p.Key(c))
-       if ok {
+       if cr.OK {
                // This commit is OK. Notify if next Commit is broken.
                next := new(Commit)
                q.Filter("ParentHash=", com.Hash)
@@ -53,7 +53,9 @@ func notifyOnFailure(c appengine.Context, com *Commit, builder string) error {
                        }
                        return err
                }
-               if ok, present := next.OK(builder, ""); present && !ok {
+               if nr := next.Result(builder, ""); nr != nil && !nr.OK {
+                       c.Debugf("commit ok: %#v\nresult: %#v", com, cr)
+                       c.Debugf("next commit broken: %#v\nnext result:%#v", next, nr)
                        broken = next
                }
        } else {
@@ -68,7 +70,9 @@ func notifyOnFailure(c appengine.Context, com *Commit, builder string) error {
                        }
                        return err
                }
-               if ok, present := prev.OK(builder, ""); present && ok {
+               if pr := prev.Result(builder, ""); pr != nil && pr.OK {
+                       c.Debugf("commit broken: %#v\nresult: %#v", com, cr)
+                       c.Debugf("previous commit ok: %#v\nprevious result:%#v", prev, pr)
                        broken = com
                }
        }