cmd/golangorg: more go-discovery exit cleanup
Remove the go-discovery app yaml file and the code paths it used.
Change-Id: I13df0433ce1b7c069061cfad29080d1f80ca9b7d
Reviewed-on: https://go-review.googlesource.com/c/website/+/344490
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/cmd/golangorg/godevapp.yaml b/cmd/golangorg/godevapp.yaml
deleted file mode 100644
index c005acf..0000000
--- a/cmd/golangorg/godevapp.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-runtime: go116
-service: go-dev
-main: ./cmd/golangorg
-
-env_variables:
- GODEV_IN_GO_DISCOVERY: true
-
-handlers:
- - url: /.*
- secure: always
- script: auto
-
-# Same performance as app.yaml for golang.org (eventually we will run there).
-instance_class: F4
-automatic_scaling:
- max_concurrent_requests: 40
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go
index 8aa55b9..905e018 100644
--- a/cmd/golangorg/server.go
+++ b/cmd/golangorg/server.go
@@ -104,15 +104,8 @@
}
handler := NewHandler(*contentDir, *goroot)
-
- if os.Getenv("GODEV_IN_GO_DISCOVERY") != "" {
- // Running in go-discovery for a little longer, do not expect the golang-org prod setup.
- handler = webtest.HandlerWithCheck(handler, "/_readycheck",
- testdataFS, "testdata/godev.txt")
- } else {
- handler = webtest.HandlerWithCheck(handler, "/_readycheck",
- testdataFS, "testdata/*.txt")
- }
+ handler = webtest.HandlerWithCheck(handler, "/_readycheck",
+ testdataFS, "testdata/*.txt")
if *verbose {
log.Printf("golang.org server:")
@@ -252,12 +245,6 @@
// When a new commit is available, watchTip downloads the new tree and calls
// tipGoroot.Set to install the new file system.
func watchTip(tipGoroot *atomicFS) {
- if os.Getenv("GODEV_IN_GO_DISCOVERY") != "" {
- // Running in go-discovery for a little longer, do not expect the golang-org prod setup.
- log.Printf("watchTip: not serving tip.golang.org in go-discovery since it's not needed nor are there enough resources for it")
- return
- }
-
for {
// watchTip1 runs until it panics (hopefully never).
// If that happens, sleep 5 minutes and try again.
@@ -323,12 +310,6 @@
func appEngineSetup(site, chinaSite *web.Site, mux *http.ServeMux) {
googleAnalytics = os.Getenv("GOLANGORG_ANALYTICS")
- log.Printf("GODEV_IN_GO_DISCOVERY %q PROJECT %q", os.Getenv("GODEV_IN_GO_DISCOVERY"), os.Getenv("PROJECT_ID"))
- if os.Getenv("GODEV_IN_GO_DISCOVERY") != "" {
- // Running in go-discovery for a little longer, do not expect the golang-org prod setup.
- return
- }
-
ctx := context.Background()
datastoreClient, err := datastore.NewClient(ctx, "")
