Fix miscellaneous prod bugs.

impl/prod/taskqueue.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package prod
 
 import (
         "fmt"
         "reflect"
 
         tq "github.com/luci/gae/service/taskqueue"
         "golang.org/x/net/context"
         "google.golang.org/appengine"
         "google.golang.org/appengine/taskqueue"
 )
 
 // useTQ adds a gae.TaskQueue implementation to context, accessible
 // by gae.GetTQ(c)
 func useTQ(c context.Context) context.Context {
         return tq.SetRawFactory(c, func(ci context.Context) tq.RawInterface {
                 return tqImpl{ci}
         })
 }
 
 type tqImpl struct {
         context.Context
 }
 
 func init() {
-        const taskExpectedFields = 9
-        // Runtime-assert that the number of fields in the Task structs is 9, to
+        const taskExpectedFields = 10
+        // Runtime-assert that the number of fields in the Task structs match, to
         // avoid missing additional fields if they're added later.
         // all other type assertions are statically enforced by o2n() and tqF2R()
 
-        oldType := reflect.TypeOf((*taskqueue.Task)(nil))
-        newType := reflect.TypeOf((*tq.Task)(nil))
+        oldType := reflect.TypeOf((*taskqueue.Task)(nil)).Elem()
+        newType := reflect.TypeOf((*tq.Task)(nil)).Elem()
 
         if oldType.NumField() != newType.NumField() ||
                 oldType.NumField() != taskExpectedFields {
                 panic(fmt.Errorf(
-                        "prod/taskqueue:init() field count differs: %v, %v",
-                        oldType, newType))
+                        "prod/taskqueue:init() field count differs: %d, %d, %d",
+                        oldType.NumField(), newType.NumField(), taskExpectedFields))
         }
 }
 
 // tqR2F (TQ real-to-fake) converts a *taskqueue.Task to a *tq.Task.
 func tqR2F(o *taskqueue.Task) *tq.Task {
         if o == nil {
                 return nil
         }
         n := tq.Task{}
         n.Path = o.Path
@@ skipping 75 matching lines @@
         }
         for _, s := range stats {
                 cb((*tq.Statistics)(&s), nil)
         }
         return nil
 }
 
 func (t tqImpl) Testable() tq.Testable {
         return nil
 }