diff options
| author | Carlos Amedee <carlos@golang.org> | 2021-12-02 18:01:05 -0500 |
|---|---|---|
| committer | Carlos Amedee <carlos@golang.org> | 2021-12-02 23:07:11 +0000 |
| commit | ab9c578b4260313115ee5f3b8b3064c49345ea81 (patch) | |
| tree | 15a48ba87a230946339956398b92a297e8b1cc51 /cmd/golangorg/server.go | |
| parent | daaa3e0ec4b0c6dbbcc016702208c3a2e86e2755 (diff) | |
| download | go-x-website-ab9c578b4260313115ee5f3b8b3064c49345ea81.tar.xz | |
cmd/golangorg: create datastore connection bofore using it
This change creates a datastore connection before it is used by any of
the handlers.
Change-Id: I694f3c13bac0433935cf7879d90e7f6ca9b48eca
Reviewed-on: https://go-review.googlesource.com/c/website/+/368974
Trust: Carlos Amedee <carlos@golang.org>
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Website-Publish: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
Diffstat (limited to 'cmd/golangorg/server.go')
| -rw-r--r-- | cmd/golangorg/server.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go index 1d0f3e4a..ae9dea33 100644 --- a/cmd/golangorg/server.go +++ b/cmd/golangorg/server.go @@ -206,6 +206,9 @@ func NewHandler(contentDir, goroot string) http.Handler { if err != nil { log.Fatalf("newSite golang.google.cn: %v", err) } + if runningOnAppEngine { + appEngineSetup(mux) + } dl.RegisterHandlers(siteMux, godevSite, "", datastoreClient, memcacheClient) dl.RegisterHandlers(siteMux, chinaSite, "golang.google.cn", datastoreClient, memcacheClient) mux.Handle("/", siteMux) @@ -222,10 +225,6 @@ func NewHandler(contentDir, goroot string) http.Handler { redirect.Register(mux) - if runningOnAppEngine { - appEngineSetup(mux) - } - // Note: Using godevSite (non-China) for global mux registration because there's no sharing in talks. // Don't need the hassle of two separate registrations for different domains in siteMux. if err := talks.RegisterHandlers(mux, godevSite, contentFS); err != nil { |