Interface update, per-method Contexts.

impl/memory/taskqueue_data.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package memory
 
 import (
         "errors"
         "fmt"
         "net/http"
         "sync"
         "sync/atomic"
 
         "golang.org/x/net/context"
 
         ds "github.com/luci/gae/service/datastore"
+        "github.com/luci/gae/service/info"
         tq "github.com/luci/gae/service/taskqueue"
+
         "github.com/luci/luci-go/common/clock"
 )
 
 var (
         currentNamespace = http.CanonicalHeaderKey("X-AppEngine-Current-Namespace")
         defaultNamespace = http.CanonicalHeaderKey("X-AppEngine-Default-Namespace")
 )
 
 //////////////////////////////// taskQueueData /////////////////////////////////
 
@@ skipping 92 matching lines @@
         queueName, err := t.getQueueNameLocked(queueName)
         if err != nil {
                 return err
         }
 
         t.named[queueName] = map[string]*tq.Task{}
         t.archived[queueName] = map[string]*tq.Task{}
         return nil
 }
 
-func (t *taskQueueData) prepTask(c context.Context, ns string, task *tq.Task, queueName string) (*tq.Task, error) {
+func (t *taskQueueData) prepTask(c context.Context, task *tq.Task, queueName string) (*tq.Task, error) {
         toSched := task.Duplicate()
 
         if toSched.Path == "" {
                 toSched.Path = "/_ah/queue/" + queueName
         }
 
         if toSched.ETA.IsZero() {
                 toSched.ETA = clock.Now(c).Add(toSched.Delay)
         } else if toSched.Delay != 0 {
                 panic("taskqueue: both Delay and ETA are set")
@@ skipping 10 matching lines @@
 
         // Methods that can not have payloads.
         case "GET", "HEAD", "DELETE":
                 toSched.Payload = nil
 
         default:
                 return nil, fmt.Errorf("taskqueue: bad method %q", toSched.Method)
         }
 
         if _, ok := toSched.Header[currentNamespace]; !ok {
-                if ns != "" {
+                if ns := info.GetNamespace(c); ns != "" {
                         if toSched.Header == nil {
                                 toSched.Header = http.Header{}
                         }
                         toSched.Header[currentNamespace] = []string{ns}
                 }
         }
         // TODO(riannucci): implement DefaultNamespace
 
         if toSched.Name == "" {
                 toSched.Name = mkName(c, "", t.named[queueName])
@@ skipping 78 matching lines @@
         return t.parent.GetTombstonedTasks()
 }
 
 func (t *txnTaskQueueData) GetScheduledTasks() tq.QueueData {
         return t.parent.GetScheduledTasks()
 }
 
 func (t *txnTaskQueueData) CreateQueue(queueName string) {
         t.parent.CreateQueue(queueName)
 }