mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-27 05:32:27 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

web/ui: fix asset generation for Go modules installs

Browse source 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
Simon Pasquier 2018-11-12 10:56:21 +01:00
parent bf9a1d3d15
commit d89c01b065
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/ui/ui.go
View file

@ -16,8 +16,6 @@
package ui package ui
import ( import (
"go/build"
"log"
"net/http" "net/http"
"os" "os"
"strings" "strings"
@ -26,16 +24,8 @@ import (
"github.com/shurcooL/httpfs/union" "github.com/shurcooL/httpfs/union"
) )
func importPathToDir(importPath string) string {
p, err := build.Import(importPath, "", build.FindOnly)
if err != nil {
log.Fatalln(err)
}
return p.Dir
}
var static http.FileSystem = filter.Keep( var static http.FileSystem = filter.Keep(
http.Dir(importPathToDir("github.com/prometheus/prometheus/web/ui/static")), http.Dir("./static"),
func(path string, fi os.FileInfo) bool { func(path string, fi os.FileInfo) bool {
return fi.IsDir() || return fi.IsDir() ||
(!strings.HasSuffix(path, "map.js") && (!strings.HasSuffix(path, "map.js") &&
@ -46,7 +36,7 @@ var static http.FileSystem = filter.Keep(
) )
var templates http.FileSystem = filter.Keep( var templates http.FileSystem = filter.Keep(
http.Dir(importPathToDir("github.com/prometheus/prometheus/web/ui/templates")), http.Dir("./templates"),
func(path string, fi os.FileInfo) bool { func(path string, fi os.FileInfo) bool {
return fi.IsDir() || strings.HasSuffix(path, ".html") return fi.IsDir() || strings.HasSuffix(path, ".html")
}, },