diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2015-08-12 21:26:25 +0200 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-08-15 17:38:56 +0000 |
| commit | e8c4a5b8930ea0aa9c14008b0d387ac693ad5c8b (patch) | |
| tree | 63a267cf1416a06b9bb6283ef7e8f59cd4d5ccff | |
| parent | 5bf1369c9ba09df6df2fbd3b8221f22b1d52d2ee (diff) | |
| download | go-e8c4a5b8930ea0aa9c14008b0d387ac693ad5c8b.tar.gz go-e8c4a5b8930ea0aa9c14008b0d387ac693ad5c8b.zip | |
cmd/trace: fix static file reference
Use runtime.GOROOT instead of os.Getenv("GOROOT") to reference
trace-viewer html file. GOROOT env var is not necessary set,
runtime.GOROOT has a default value for such case.
Change-Id: I906a720f6822915bd9575756e6cbf6d622857c2b
Reviewed-on: https://go-review.googlesource.com/13593
Reviewed-by: Russ Cox <rsc@golang.org>
| -rw-r--r-- | src/cmd/trace/trace.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/trace/trace.go b/src/cmd/trace/trace.go index 0d2451b4ec..e6eb320aa2 100644 --- a/src/cmd/trace/trace.go +++ b/src/cmd/trace/trace.go @@ -10,8 +10,8 @@ import ( "internal/trace" "log" "net/http" - "os" "path/filepath" + "runtime" "strconv" "strings" ) @@ -63,7 +63,7 @@ var templTrace = ` // httpTraceViewerHTML serves static part of trace-viewer. // This URL is queried from templTrace HTML. func httpTraceViewerHTML(w http.ResponseWriter, r *http.Request) { - http.ServeFile(w, r, filepath.Join(os.Getenv("GOROOT"), "misc", "trace", "trace_viewer_lean.html")) + http.ServeFile(w, r, filepath.Join(runtime.GOROOT(), "misc", "trace", "trace_viewer_lean.html")) } // httpJsonTrace serves json trace, requested from within templTrace HTML. |