From 1633383a2bb20dcafbba3df60dbb94374cadd414 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 16 Aug 2013 19:49:24 -0700 Subject: [PATCH] cmd/godoc: don't start up indexer in command-line mode Fixes golang/go#6075 R=golang-dev, adg CC=golang-dev https://golang.org/cl/12995044 --- cmd/godoc/main.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/godoc/main.go b/cmd/godoc/main.go index 51124bfd..5dc1b601 100644 --- a/cmd/godoc/main.go +++ b/cmd/godoc/main.go @@ -214,15 +214,19 @@ func main() { fs.Bind("/src/pkg", vfs.OS(p), "/src", vfs.BindAfter) } + httpMode := *httpAddr != "" + corpus := godoc.NewCorpus(fs) corpus.Verbose = *verbose - corpus.IndexEnabled = *indexEnabled + corpus.IndexEnabled = *indexEnabled && httpMode corpus.IndexFiles = *indexFiles if *writeIndex { corpus.IndexThrottle = 1.0 } - if err := corpus.Init(); err != nil { - log.Fatal(err) + if *writeIndex || httpMode || *urlFlag != "" { + if err := corpus.Init(); err != nil { + log.Fatal(err) + } } pres = godoc.NewPresentation(corpus) @@ -270,7 +274,7 @@ func main() { return } - if *httpAddr != "" { + if httpMode { // HTTP server mode. var handler http.Handler = http.DefaultServeMux if *verbose {