github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: use `utils.Log` during static file router init (#2100) 

formerly the log is not in stderr
pull/2114/head
BoYanZh 2022-10-24 23:33:57 +08:00 committed by GitHub
parent e3b7c41199
commit 3e9c38697d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/static/static.go
View File

@ -10,15 +10,18 @@ import (
"github.com/alist-org/alist/v3/cmd/flags" "github.com/alist-org/alist/v3/cmd/flags"
"github.com/alist-org/alist/v3/internal/conf" "github.com/alist-org/alist/v3/internal/conf"
"github.com/alist-org/alist/v3/internal/setting" "github.com/alist-org/alist/v3/internal/setting"
"github.com/alist-org/alist/v3/pkg/utils"
"github.com/alist-org/alist/v3/public" "github.com/alist-org/alist/v3/public"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
log "github.com/sirupsen/logrus"
) )
func InitIndex() { func InitIndex() {
index, err := public.Public.ReadFile("dist/index.html") index, err := public.Public.ReadFile("dist/index.html")
if err != nil { if err != nil {
log.Fatalf("failed to read index.html: %v", err) if err == fs.ErrNotExist {
utils.Log.Fatalf("index.html not exist, you may forget to put dist of frontend to public/dist")
}
utils.Log.Fatalf("failed to read index.html: %v", err)
} }
conf.RawIndexHtml = string(index) conf.RawIndexHtml = string(index)
siteConfig := getSiteConfig() siteConfig := getSiteConfig()
@ -65,7 +68,7 @@ func Static(r *gin.Engine) {
folder = "dist/" + folder folder = "dist/" + folder
sub, err := fs.Sub(public.Public, folder) sub, err := fs.Sub(public.Public, folder)
if err != nil { if err != nil {
log.Fatalf("can't find folder: %s", folder) utils.Log.Fatalf("can't find folder: %s", folder)
} }
r.StaticFS(fmt.Sprintf("/%s/", folders[i]), http.FS(sub)) r.StaticFS(fmt.Sprintf("/%s/", folders[i]), http.FS(sub))
} }