devapp: revert status changes

This reverts the status changes to devapp from CL 96416

This will go into its own server instead.

Updates golang/go#21315
Updates golang/go#22603

Change-Id: Icb17a5915124241b2ef97a1ee2e9a0e4298784ce
Reviewed-on: https://go-review.googlesource.com/97516
Reviewed-by: Andrew Bonventre <[email protected]>

Author: bradfitz

devapp/devapp.go

@@ -62,9 +62,7 @@ func main() {
 		go func() {
 			handler := http.Handler(s)
 			if *autocertBucket != "" {
-				handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-					redirectHTTP(w, r, s)
-				})
+				handler = http.HandlerFunc(redirectHTTP)
 			}
 			errc <- fmt.Errorf("http.Serve = %v", http.Serve(ln, handler))
 		}()
@@ -79,19 +77,11 @@ func main() {
 	log.Fatal(<-errc)
 }
 
-func redirectHTTP(w http.ResponseWriter, r *http.Request, h http.Handler) {
+func redirectHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.TLS != nil || r.Host == "" {
 		http.NotFound(w, r)
 		return
 	}
-
-	// Serve /status directly, without a forced redirect.
-	// This lets monitoring avoid a dependency on LetsEncrypt being up.
-	if strings.HasPrefix(r.RequestURI, "/status") {
-		h.ServeHTTP(w, r)
-		return
-	}
-
 	http.Redirect(w, r, "https://"+r.Host+r.RequestURI, http.StatusFound)
 }
 

devapp/server.go

@@ -19,7 +19,6 @@ import (
 
 	"golang.org/x/build/maintner"
 	"golang.org/x/build/maintner/godata"
-	"golang.org/x/build/status/statusserver"
 )
 
 // A server is an http.Handler that serves content within staticDir at root and
@@ -63,10 +62,6 @@ func newServer(mux *http.ServeMux, staticDir, templateDir string) *server {
 	s.mux.HandleFunc("/release", s.withTemplate("/release.tmpl", s.handleRelease))
 	s.mux.HandleFunc("/reviews", s.withTemplate("/reviews.tmpl", s.handleReviews))
 	s.mux.HandleFunc("/dir/", handleDirRedirect)
-
-	ss := statusserver.NewHandler()
-	ss.Register(s.mux) // at /status
-
 	for _, p := range []string{"/imfeelinghelpful", "/imfeelinglucky"} {
 		s.mux.HandleFunc(p, s.handleRandomHelpWantedIssue)
 	}