Chromium Code Reviews| Index: milo/appengine/frontend/config.go |
| diff --git a/milo/appengine/frontend/config.go b/milo/appengine/frontend/config.go |
| index 7d22ae34c3698e637749238af37a800a959f8a5d..3e8402d3b1ae51c5b1cf8a35aab3134ed0ee4401 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,33 @@ 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) |
| - return |
| + 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") |
|
nodir
2017/04/04 23:12:08
yeah, double logging
hinoka
2017/04/05 20:45:06
Acknowledged. Doesn't log on the other side now.
nodir
2017/04/05 21:47:50
still does
|
| + } |
| + if projErr != nil || servErr != nil { |
| + h.WriteHeader(http.StatusInternalServerError) |
|
nodir
2017/04/04 23:12:08
return
hinoka
2017/04/05 20:45:06
Done.
|
| } |
| - logging.Infof(c, "Successfully completed") |
| - h.WriteHeader(200) |
| + h.WriteHeader(http.StatusOK) |
| } |