From 84d44bd73d1e20dd061849d296302a97052afdff Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Tue, 5 Mar 2019 18:09:30 -0500 Subject: blog: deploy with App Engine Standard on Go 1.11 This change upgrades the deployment of blog to use the newer Go 1.11 runtime. As part of that, the appengine build tag is removed (it's no longer set by App Engine), and the GAE_ENV environment variable is used to detect when blog is being run in App Engine mode. Set an environment variable in app.yaml to configure the x/tools/godoc/golangorgenv package appropriately. Modify the static file server to also serve /favicon.ico, but keep static file handlers in app.yaml for improved latency across global regions. Updates golang/go#30486 Change-Id: I63ca78a075d94d43a40f0b963b5f6d0d8270c34e Reviewed-on: https://go-review.googlesource.com/c/blog/+/165460 Reviewed-by: Brad Fitzpatrick --- appengine.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'appengine.go') diff --git a/appengine.go b/appengine.go index 288247e..3b65bc7 100644 --- a/appengine.go +++ b/appengine.go @@ -2,27 +2,32 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build appengine - // This file implements an App Engine blog server. package main import ( + "log" "net/http" + "os" "golang.org/x/tools/blog" ) -func init() { +func gaeMain() { config.ContentPath = "content/" config.TemplatePath = "template/" s, err := blog.NewServer(config) if err != nil { - panic(err) + log.Fatalln(err) } http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Strict-Transport-Security", "max-age=31536000; preload") s.ServeHTTP(w, r) }) + port := os.Getenv("PORT") + if port == "" { + port = "8080" + } + log.Fatal(http.ListenAndServe(":"+port, nil)) } -- cgit v1.2.3