guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sorting plugins so that execution order is deterministic (#1961)

This commit is contained in:
Luka Čehovin Zajc 2020-08-31 13:49:46 +02:00 committed by GitHub
parent b1181fd17a
commit 268afb3438
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/service.go
View File

@ -27,6 +27,7 @@ import (
"math/big" "math/big"
"net" "net"
"net/http" "net/http"
"sort"
"time" "time"
"github.com/fatedier/frp/assets" "github.com/fatedier/frp/assets"
@ -133,8 +134,14 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) {
} }
// Init all plugins // Init all plugins
for name, options := range cfg.HTTPPlugins { plugin_names := make([]string, 0, len(cfg.HTTPPlugins))
svr.pluginManager.Register(plugin.NewHTTPPluginOptions(options)) for n := range cfg.HTTPPlugins {
plugin_names = append(plugin_names, n)
}
sort.Strings(plugin_names)
for _, name := range plugin_names {
svr.pluginManager.Register(plugin.NewHTTPPluginOptions(cfg.HTTPPlugins[name]))
log.Info("plugin [%s] has been registered", name) log.Info("plugin [%s] has been registered", name)
} }
svr.rc.PluginManager = svr.pluginManager svr.rc.PluginManager = svr.pluginManager