Fijxu/justlog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix assets handling

Browse source
This commit is contained in:
gempir 2020-08-30 12:07:56 +02:00
parent cd7b88424f
commit 40d8a53134
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/assets_vfsgen.go
View file

File diff suppressed because one or more lines are too long

13
api/server.go
View file

@ -36,7 +36,7 @@ func NewServer(logPath string, listenAddress string, fileLogger *filelog.Logger,
fileLogger: fileLogger,
helixClient: helixClient,
channels: channels,
assets: []string{"/", "/assets", "/favicon.ico"},
assets: []string{"/", "/favicon.ico"},
assetHandler: http.FileServer(assets),
}
}
@ -105,7 +105,12 @@ func (s *Server) Init() {
func (s *Server) route(w http.ResponseWriter, r *http.Request) {
url := r.URL.EscapedPath()
if containsPrefix(s.assets, url) {
if contains(s.assets, url) {
s.assetHandler.ServeHTTP(w, r)
return
}
if strings.HasPrefix(url, "/assets") {
s.assetHandler.ServeHTTP(w, r)
return
}
@ -218,9 +223,9 @@ func corsHandler(h http.Handler) http.Handler {
})
}
func containsPrefix(s []string, e string) bool {
func contains(s []string, e string) bool {
for _, a := range s {
if strings.HasPrefix(e, a) {
if a == e {
return true
}
}