diff options
author | Chris <ccbrown112@gmail.com> | 2017-11-06 21:53:40 -0600 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-11-06 19:53:40 -0800 |
commit | 61db2ff59bc5146a85a8275a4ce231eb1d5e03f1 (patch) | |
tree | 8945439c28f66553f2f087048cce5bfea9856f6f | |
parent | fef70d6c9e525466676350c5696459c2670807e8 (diff) | |
download | chat-61db2ff59bc5146a85a8275a4ce231eb1d5e03f1.tar.gz chat-61db2ff59bc5146a85a8275a4ce231eb1d5e03f1.tar.bz2 chat-61db2ff59bc5146a85a8275a4ce231eb1d5e03f1.zip |
fix builtin plugin http router (#7797)
-rw-r--r-- | app/app.go | 1 | ||||
-rw-r--r-- | app/plugins.go | 2 | ||||
-rw-r--r-- | cmd/platform/server.go | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/app.go b/app/app.go index 354e8ebf6..81db20830 100644 --- a/app/app.go +++ b/app/app.go @@ -93,6 +93,7 @@ func New(options ...Option) *App { app.Srv.Store = app.newStore() app.initJobs() + app.initBuiltInPlugins() app.Srv.Router.HandleFunc("/plugins/{plugin_id:[A-Za-z0-9\\_\\-\\.]+}", app.ServePluginRequest) app.Srv.Router.HandleFunc("/plugins/{plugin_id:[A-Za-z0-9\\_\\-\\.]+}/{anything:.*}", app.ServePluginRequest) diff --git a/app/plugins.go b/app/plugins.go index ce55bfc20..0ce669290 100644 --- a/app/plugins.go +++ b/app/plugins.go @@ -249,7 +249,7 @@ func (api *BuiltInPluginAPI) I18n(id string, r *http.Request) string { return f(id) } -func (a *App) InitBuiltInPlugins() { +func (a *App) initBuiltInPlugins() { plugins := map[string]builtinplugin.Plugin{ "jira": &jira.Plugin{}, "ldapextras": &ldapextras.Plugin{}, diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 00dbb9ec5..c64b607d8 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -71,8 +71,6 @@ func runServer(configFileLocation string) { a.LoadLicense() } - a.InitBuiltInPlugins() - if webappDir, ok := utils.FindDir(model.CLIENT_DIR); ok { a.InitPlugins(*a.Config().PluginSettings.Directory, webappDir+"/plugins") utils.AddConfigListener(func(prevCfg, cfg *model.Config) { |