Add server/cache support to gaeconfig.

appengine/gaemiddleware/context.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 gaemiddleware
 
 import (
         "net/http"
 
         "golang.org/x/net/context"
         "google.golang.org/appengine"
 
         "github.com/luci/gae/filter/dscache"
         "github.com/luci/gae/impl/prod"
         "github.com/luci/gae/service/urlfetch"
 
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/data/caching/cacheContext"
         "github.com/luci/luci-go/common/data/caching/proccache"
         "github.com/luci/luci-go/common/logging"
 
         "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/auth/authdb"
         "github.com/luci/luci-go/server/middleware"
         "github.com/luci/luci-go/server/router"
         "github.com/luci/luci-go/server/settings"
 
         "github.com/luci/luci-go/appengine/gaeauth/client"
         "github.com/luci/luci-go/appengine/gaeauth/server"
         "github.com/luci/luci-go/appengine/gaeauth/server/gaesigner"
-        "github.com/luci/luci-go/appengine/gaeconfig"
         "github.com/luci/luci-go/appengine/gaesecrets"
         "github.com/luci/luci-go/appengine/gaesettings"
         "github.com/luci/luci-go/appengine/tsmon"
+        "github.com/luci/luci-go/luci_config/appengine/gaeconfig"
 )
 
 var (
         // globalProcessCache holds state cached between requests.
         globalProcessCache = &proccache.Cache{}
 
         // globalSettings holds global app settings lazily updated from the datastore.
         globalSettings = settings.New(gaesettings.Storage{})
 
         // globalAuthConfig is configuration of the server/auth library.
@@ skipping 35 matching lines @@
 
         // Fetch and apply configuration stored in the datastore.
         cachedSettings := fetchCachedSettings(c)
         c = logging.SetLevel(c, cachedSettings.LoggingLevel)
         if !cachedSettings.DisableDSCache {
                 c = dscache.AlwaysFilterRDS(c)
         }
 
         // The rest of the service may use applied configuration.
         c = proccache.Use(c, globalProcessCache)
-        c = config.SetImplementation(c, gaeconfig.New(c))
+        c = gaeconfig.Use(c)
         c = gaesecrets.Use(c, nil)
         c = auth.SetConfig(c, globalAuthConfig)
 
         // Wrap this in a cache context so that lookups for any of the aforementioned
         // items are fast.
         return cacheContext.Wrap(c)
 }
 
 // ProdServices is a middleware that installs the set of standard production
 // AppEngine services by calling WithProd.
@@ skipping 16 matching lines @@
 // BaseProd returns a list of middleware: WithProd middleware, a panic catcher if this
 // is not a devserver, and the monitoring middleware.
 func BaseProd() router.MiddlewareChain {
         if appengine.IsDevAppServer() {
                 return router.NewMiddlewareChain(ProdServices, globalTsMonState.Middleware)
         }
         return router.NewMiddlewareChain(
                 ProdServices, middleware.WithPanicCatcher, globalTsMonState.Middleware,
         )
 }