diff options
author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-05-23 14:26:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-23 14:26:35 -0400 |
commit | 847c181ec9b73e51daf39efc5c597eff2e7cdb31 (patch) | |
tree | 54bcb4a3ac43f9acb22ff037582541c7428bd990 /api4/plugin.go | |
parent | 5c21bdc1783e5cd17169436e7ccfacdd1b637907 (diff) | |
download | chat-847c181ec9b73e51daf39efc5c597eff2e7cdb31.tar.gz chat-847c181ec9b73e51daf39efc5c597eff2e7cdb31.tar.bz2 chat-847c181ec9b73e51daf39efc5c597eff2e7cdb31.zip |
MM-8622: Improved plugin error reporting (#8737)
* allow `Wait()`ing on the supervisor
In the event the plugin supervisor shuts down a plugin for crashing too
many times, the new `Wait()` interface allows the `ActivatePlugin` to
accept a callback function to trigger when `supervisor.Wait()` returns.
If the supervisor shuts down normally, this callback is invoked with
a nil error, otherwise any error reported by the supervisor is passed
along.
* improve plugin activation/deactivation logic
Avoid triggering activation of previously failed-to-start plugins just
becase something in the configuration changed. Now, intelligently
compare the global enable bit as well as the each individual plugin's
enabled bit.
* expose store to manipulate PluginStatuses
* expose API to fetch plugin statuses
* keep track of whether or not plugin sandboxing is supported
* transition plugin statuses
* restore error on plugin activation if already active
* don't initialize test plugins until successfully loaded
* emit websocket events when plugin statuses change
* skip pruning if already initialized
* MM-8622: maintain plugin statuses in memory
Switch away from persisting plugin statuses to the database, and
maintain in memory instead. This will be followed by a cluster interface
to query the in-memory status of plugin statuses from all cluster nodes.
At the same time, rename `cluster_discovery_id` on the `PluginStatus`
model object to `cluster_id`.
* MM-8622: aggregate plugin statuses across cluster
* fetch cluster plugin statuses when emitting websocket notification
* address unit test fixes after rebasing
* relax (poor) racey unit test re: supervisor.Wait()
* make store-mocks
Diffstat (limited to 'api4/plugin.go')
-rw-r--r-- | api4/plugin.go | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/api4/plugin.go b/api4/plugin.go index 37fbf12cd..ab026ab5f 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -23,6 +23,7 @@ func (api *API) InitPlugin() { api.BaseRoutes.Plugins.Handle("", api.ApiSessionRequired(getPlugins)).Methods("GET") api.BaseRoutes.Plugin.Handle("", api.ApiSessionRequired(removePlugin)).Methods("DELETE") + api.BaseRoutes.Plugins.Handle("/statuses", api.ApiSessionRequired(getPluginStatuses)).Methods("GET") api.BaseRoutes.Plugin.Handle("/activate", api.ApiSessionRequired(activatePlugin)).Methods("POST") api.BaseRoutes.Plugin.Handle("/deactivate", api.ApiSessionRequired(deactivatePlugin)).Methods("POST") @@ -97,6 +98,26 @@ func getPlugins(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(response.ToJson())) } +func getPluginStatuses(c *Context, w http.ResponseWriter, r *http.Request) { + if !*c.App.Config().PluginSettings.Enable { + c.Err = model.NewAppError("getPluginStatuses", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) + return + } + + if !c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { + c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) + return + } + + response, err := c.App.GetClusterPluginStatuses() + if err != nil { + c.Err = err + return + } + + w.Write([]byte(response.ToJson())) +} + func removePlugin(c *Context, w http.ResponseWriter, r *http.Request) { c.RequirePluginId() if c.Err != nil { @@ -104,7 +125,7 @@ func removePlugin(c *Context, w http.ResponseWriter, r *http.Request) { } if !*c.App.Config().PluginSettings.Enable { - c.Err = model.NewAppError("getPlugins", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) + c.Err = model.NewAppError("removePlugin", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) return } |