LogDog: Update to archival V2.

appengine/cmd/logdog_coordinator/vmuser/main.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 main
 
 import (
         "net/http"
 
         "github.com/julienschmidt/httprouter"
@@ skipping 47 matching lines @@
         // Redirect "/" to "/app/".
         router.GET("/", func(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
                 http.Redirect(w, r, "/app/", http.StatusFound)
         })
 
         http.Handle("/", router)
         appengine.Main()
 }
 
 func accessControl(c context.Context, origin string) bool {
-        cfg, err := config.Load(c)
+        gcfg, err := config.LoadGlobalConfig(c)
         if err != nil {
-                log.WithError(err).Errorf(c, "Failed to get config for access control check.")
+                log.WithError(err).Errorf(c, "Failed to get global config for access control check.")
                 return false
         }
 
+        cfg, err := gcfg.LoadConfig(c)
+        if err != nil {
+                log.WithError(err).Errorf(c, "Failed to get application config for access control check.")
+                return false
+        }
+
         ccfg := cfg.GetCoordinator()
         if ccfg == nil {
                 return false
         }
 
         for _, o := range ccfg.RpcAllowOrigins {
                 if o == origin {
                         return true
                 }
         }
         return false
 }