diff --git a/Makefile b/Makefile index c6acda1c..ae1a013e 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,6 @@ file: rm -rf ./assets/frpc/static/* cp -rf ./web/frps/dist/* ./assets/frps/static cp -rf ./web/frpc/dist/* ./assets/frpc/static - rm -rf ./assets/frps/statik - rm -rf ./assets/frpc/statik - go generate ./assets/... fmt: go fmt ./... diff --git a/assets/assets.go b/assets/assets.go index 054ff06e..f433b0e2 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -31,15 +31,13 @@ var ( // if path is empty, load assets in memory // or set FileSystem using disk files -func Load(path string) (err error) { +func Load(path string) { prefixPath = path if prefixPath != "" { FileSystem = http.Dir(prefixPath) - return nil } else { FileSystem = http.FS(content) } - return err } func Register(fs fs.FS) { diff --git a/client/service.go b/client/service.go index 63987574..a74ad3a0 100644 --- a/client/service.go +++ b/client/service.go @@ -124,13 +124,10 @@ func (svr *Service) Run() error { if svr.cfg.AdminPort != 0 { // Init admin server assets - err := assets.Load(svr.cfg.AssetsDir) - if err != nil { - return fmt.Errorf("Load assets error: %v", err) - } + assets.Load(svr.cfg.AssetsDir) address := net.JoinHostPort(svr.cfg.AdminAddr, strconv.Itoa(svr.cfg.AdminPort)) - err = svr.RunAdminServer(address) + err := svr.RunAdminServer(address) if err != nil { log.Warn("run admin server error: %v", err) } diff --git a/go.mod b/go.mod index 0d57e07b..938089c7 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/pires/go-proxyproto v0.5.0 github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect github.com/prometheus/client_golang v1.11.0 - github.com/rakyll/statik v0.1.1 github.com/rodaine/table v1.0.1 github.com/spf13/cobra v1.1.3 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 51511b2b..de5929c8 100644 --- a/go.sum +++ b/go.sum @@ -332,8 +332,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rakyll/statik v0.1.1 h1:fCLHsIMajHqD5RKigbFXpvX3dN7c80Pm12+NCrI3kvg= -github.com/rakyll/statik v0.1.1/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= github.com/rodaine/table v1.0.1 h1:U/VwCnUxlVYxw8+NJiLIuCxA/xa6jL38MY3FYysVWWQ= github.com/rodaine/table v1.0.1/go.mod h1:UVEtfBsflpeEcD56nF4F5AocNFta0ZuolpSVdPtlmP4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= diff --git a/server/service.go b/server/service.go index b678010f..b854654f 100644 --- a/server/service.go +++ b/server/service.go @@ -280,11 +280,7 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) { // Create dashboard web server. if cfg.DashboardPort > 0 { // Init dashboard assets - err = assets.Load(cfg.AssetsDir) - if err != nil { - err = fmt.Errorf("Load assets error: %v", err) - return - } + assets.Load(cfg.AssetsDir) address := net.JoinHostPort(cfg.DashboardAddr, strconv.Itoa(cfg.DashboardPort)) err = svr.RunDashboardServer(address)