diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2021-04-27 02:48:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 02:48:47 -0700 |
| commit | 5861ba46087bc65433c50acaf9b7dc07862868be (patch) | |
| tree | 702c8ab1710e94c64a64905bec63fb1632b5e4b0 /weed/weed.go | |
| parent | 400c8ef8d88eae27a1abbef3da0badd8ef1bab6d (diff) | |
| parent | 7a9d27fce859bc3c7d95a6a98154eab1eb55aa4f (diff) | |
| download | seaweedfs-5861ba46087bc65433c50acaf9b7dc07862868be.tar.xz seaweedfs-5861ba46087bc65433c50acaf9b7dc07862868be.zip | |
Merge pull request #2027 from bingoohuang/master
promote to go:embed instead of github.com/rakyll/statik
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()) |