From da0a4e775bcb7cbef3ea4fd5592d0a8cee436d92 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 10 May 2021 00:13:55 -0700 Subject: Revert "Revert "Merge pull request #2027 from bingoohuang/master"" This reverts commit d74cdf011553ae073d524a080f65f418c76ccaa7. --- weed/weed.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'weed/weed.go') diff --git a/weed/weed.go b/weed/weed.go index 6e69c1480..91c17d9ff 100644 --- a/weed/weed.go +++ b/weed/weed.go @@ -1,12 +1,12 @@ -//go:generate statik -src=./static -// install this first "go get github.com/rakyll/statik" - package main import ( + "embed" "fmt" + weed_server "github.com/chrislusf/seaweedfs/weed/server" flag "github.com/chrislusf/seaweedfs/weed/util/fla9" "io" + "io/fs" "math/rand" "os" "strings" @@ -35,6 +35,13 @@ func setExitStatus(n int) { exitMu.Unlock() } +//go:embed static +var static embed.FS + +func init() { + weed_server.StaticFS, _ = fs.Sub(static, "static") +} + func main() { glog.MaxSize = 1024 * 1024 * 32 rand.Seed(time.Now().UnixNano()) -- cgit v1.2.3