diff options
Diffstat (limited to 'app/plugins.go')
| -rw-r--r-- | app/plugins.go | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/app/plugins.go b/app/plugins.go index 579b5d4e6..ce55bfc20 100644 --- a/app/plugins.go +++ b/app/plugins.go @@ -557,30 +557,33 @@ func (a *App) InitPlugins(pluginPath, webappPath string) { utils.RemoveConfigListener(a.PluginConfigListenerId) a.PluginConfigListenerId = utils.AddConfigListener(func(prevCfg, cfg *model.Config) { - if !*prevCfg.PluginSettings.Enable && *cfg.PluginSettings.Enable { - a.InitPlugins(pluginPath, webappPath) - } else if *prevCfg.PluginSettings.Enable && !*cfg.PluginSettings.Enable { - a.ShutDownPlugins() - } else if *prevCfg.PluginSettings.Enable && *cfg.PluginSettings.Enable { - a.ActivatePlugins() - } - if a.PluginEnv == nil { return } + if *prevCfg.PluginSettings.Enable && *cfg.PluginSettings.Enable { + a.ActivatePlugins() + } + for _, err := range a.PluginEnv.Hooks().OnConfigurationChange() { l4g.Error(err.Error()) } }) - a.Srv.Router.HandleFunc("/plugins/{plugin_id:[A-Za-z0-9\\_\\-\\.]+}", a.ServePluginRequest) - a.Srv.Router.HandleFunc("/plugins/{plugin_id:[A-Za-z0-9\\_\\-\\.]+}/{anything:.*}", a.ServePluginRequest) - a.ActivatePlugins() } func (a *App) ServePluginRequest(w http.ResponseWriter, r *http.Request) { + if a.PluginEnv == nil || !*a.Config().PluginSettings.Enable { + err := model.NewAppError("ServePluginRequest", "app.plugin.disabled.app_error", nil, "Enable plugins to serve plugin requests", http.StatusNotImplemented) + err.Translate(utils.T) + l4g.Error(err.Error()) + w.WriteHeader(err.StatusCode) + w.Header().Set("Content-Type", "application/json") + w.Write([]byte(err.ToJson())) + return + } + token := "" authHeader := r.Header.Get(model.HEADER_AUTH) |