From 6216dca17a5cf6fcc6f6720f937627f74a373839 Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Tue, 12 Nov 2024 12:30:37 -0800 Subject: [PATCH] Fix docsite path error in docsite.go (#1272) The docsite path was being initialized as a global variable. This wasn't an issue before we were caching and unsetting the env vars, but now that `wavebase.GetWaveAppPath()` returns the contents of the cached variable, we need to read its value at runtime, since it won't be set at the time the global variable is initialized. --- .gitignore | 2 ++ pkg/docsite/docsite.go | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7ef456ccb..e585825b8 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ artifacts/ storybook-static/ test-results.xml + +docsite/ diff --git a/pkg/docsite/docsite.go b/pkg/docsite/docsite.go index 3e83fdfc8..949054d86 100644 --- a/pkg/docsite/docsite.go +++ b/pkg/docsite/docsite.go @@ -9,11 +9,10 @@ import ( "github.com/wavetermdev/waveterm/pkg/wavebase" ) -var docsiteStaticPath = filepath.Join(wavebase.GetWaveAppPath(), "docsite") - var docsiteHandler http.Handler func GetDocsiteHandler() http.Handler { + docsiteStaticPath := filepath.Join(wavebase.GetWaveAppPath(), "docsite") stat, err := os.Stat(docsiteStaticPath) if docsiteHandler == nil { log.Println("Docsite is nil, initializing") @@ -21,7 +20,7 @@ func GetDocsiteHandler() http.Handler { log.Printf("Found static site at %s, serving\n", docsiteStaticPath) docsiteHandler = http.FileServer(HTMLDir{http.Dir(docsiteStaticPath)}) } else { - log.Println("Did not find static site, serving not found handler") + log.Printf("Did not find static site at %s, serving not found handler. stat: %v, err: %v\n", docsiteStaticPath, stat, err) docsiteHandler = http.NotFoundHandler() } }