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 <[email protected]>
Run-TryBot: Carlos Amedee <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Website-Publish: Dmitri Shuralyov <[email protected]>
Reviewed-by: Heschi Kreinick <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Alexander Rakoczy <[email protected]>

Author: cagedmantis

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 {