Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: appengine/cmd/logdog_coordinator/vmuser/main.go

Issue 1863973002: LogDog: Update to archival V2. (Closed) Base URL: https://github.com/luci/luci-go@grpcutil-errors
Patch Set: Fix proto comment. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/cmd/logdog_coordinator/vmuser/main.go
diff --git a/appengine/cmd/logdog_coordinator/vmuser/main.go b/appengine/cmd/logdog_coordinator/vmuser/main.go
index 2f87cf86146b0dc117c0f72b9a93a86288f44f14..66ce0ae8958604aea953c98953cf6f0b2650a107 100644
--- a/appengine/cmd/logdog_coordinator/vmuser/main.go
+++ b/appengine/cmd/logdog_coordinator/vmuser/main.go
@@ -65,9 +65,15 @@ func 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
}
« no previous file with comments | « appengine/cmd/logdog_coordinator/vmuser/index.yaml ('k') | appengine/cmd/logdog_coordinator/vmuser/queue.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698