diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-05-10 00:13:55 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-05-10 00:13:55 -0700 |
| commit | da0a4e775bcb7cbef3ea4fd5592d0a8cee436d92 (patch) | |
| tree | c22f3cd42ac133fc905c30a209e364e5ca7fec19 /weed/weed.go | |
| parent | 40945a60cfddde46ccf2c6f7c6f9170d61fde959 (diff) | |
| download | seaweedfs-da0a4e775bcb7cbef3ea4fd5592d0a8cee436d92.tar.xz seaweedfs-da0a4e775bcb7cbef3ea4fd5592d0a8cee436d92.zip | |
Revert "Revert "Merge pull request #2027 from bingoohuang/master""
This reverts commit d74cdf011553ae073d524a080f65f418c76ccaa7.
Diffstat (limited to 'weed/weed.go')
| -rw-r--r-- | weed/weed.go | 13 |
1 files changed, 10 insertions, 3 deletions
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()) |