cmd/tip: stop using golangorg -index and -play
The flags are gone.
Fixes golang/go#44613.
Change-Id: I78449beab379f70fbfaf951bed009284503e3ad1
Reviewed-on: https://go-review.googlesource.com/c/build/+/296384
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/tip/golangorg.go b/cmd/tip/golangorg.go
index 7270428..b71b50f 100644
--- a/cmd/tip/golangorg.go
+++ b/cmd/tip/golangorg.go
@@ -5,8 +5,6 @@
package main
import (
- "bytes"
- "errors"
"fmt"
"io"
"log"
@@ -76,7 +74,7 @@
logger.Printf("starting golangorg ...")
golangorgBin := filepath.Join(binDir, "golangorg")
- golangorg := exec.Command(golangorgBin, "-http="+hostport, "-index", "-index_interval=-1s", "-play")
+ golangorg := exec.Command(golangorgBin, "-http="+hostport)
golangorg.Env = append(os.Environ(), "GOROOT="+goDir)
golangorg.Stdout = logWriter
golangorg.Stderr = logWriter
@@ -86,15 +84,7 @@
return golangorg, nil
}
-var indexingMsg = []byte("Indexing in progress: result may be inaccurate")
-
func (b golangorgBuilder) HealthCheck(hostport string) error {
- body, err := getOK(fmt.Sprintf("http://%v/search?q=FALLTHROUGH", hostport))
- if err != nil {
- return err
- }
- if bytes.Contains(body, indexingMsg) {
- return errors.New("still indexing")
- }
- return nil
+ _, err := getOK(fmt.Sprintf("http://%v/pkg/fmt", hostport))
+ return err
}
