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

Unified Diff: milo/appengine/frontend/config.go

Issue 2801463002: Milo: Use custom config caching layer (Closed)
Patch Set: Review: Remove double logging Created 3 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
« no previous file with comments | « milo/appengine/common/config_test.go ('k') | milo/appengine/frontend/cron.yaml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: milo/appengine/frontend/config.go
diff --git a/milo/appengine/frontend/config.go b/milo/appengine/frontend/config.go
index 7d22ae34c3698e637749238af37a800a959f8a5d..7a6476cb5df4adb19c61014ab9f852d921423951 100644
--- a/milo/appengine/frontend/config.go
+++ b/milo/appengine/frontend/config.go
@@ -7,6 +7,8 @@ package frontend
import (
"net/http"
+ "cloud.google.com/go/datastore"
+
"github.com/luci/luci-go/common/logging"
"github.com/luci/luci-go/milo/appengine/common"
"github.com/luci/luci-go/server/router"
@@ -22,22 +24,34 @@ func ConfigsHandler(c *router.Context) {
"Error while getting projects: "+err.Error())
return
}
+ sc, err := common.GetCurrentServiceConfig(c.Context)
+ if err != nil && err != datastore.ErrNoSuchEntity {
+ common.ErrorPage(
+ c, http.StatusInternalServerError,
+ "Error while getting service config: "+err.Error())
+ return
+ }
- templates.MustRender(c.Context, c.Writer, "pages/config.html", templates.Args{
- "Projects": projects,
+ templates.MustRender(c.Context, c.Writer, "pages/configs.html", templates.Args{
+ "Projects": projects,
+ "ServiceConfig": sc,
})
}
// UpdateHandler is an HTTP handler that handles configuration update requests.
-// TODO(hinoka): Migrate to cfgclient and remove this.
func UpdateConfigHandler(ctx *router.Context) {
c, h := ctx.Context, ctx.Writer
- err := common.UpdateProjectConfigs(c)
- if err != nil {
- logging.WithError(err).Errorf(c, "Update Handler encountered error")
- h.WriteHeader(500)
+ projErr := common.UpdateProjectConfigs(c)
+ if projErr != nil {
+ logging.WithError(projErr).Errorf(c, "project update handler encountered error")
+ }
+ servErr := common.UpdateServiceConfig(c)
+ if servErr != nil {
+ logging.WithError(servErr).Errorf(c, "service update handler encountered error")
+ }
+ if projErr != nil || servErr != nil {
+ h.WriteHeader(http.StatusInternalServerError)
return
}
- logging.Infof(c, "Successfully completed")
- h.WriteHeader(200)
+ h.WriteHeader(http.StatusOK)
}
« no previous file with comments | « milo/appengine/common/config_test.go ('k') | milo/appengine/frontend/cron.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698