diff options
| author | Chris <ccbrown112@gmail.com> | 2018-03-13 11:03:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 11:03:12 -0500 |
| commit | caf9c2409935124db85daf5b04d61b7a663ebfc8 (patch) | |
| tree | 701f4b7a3ad9f1e7392ded1e52dc1c4871d872a3 | |
| parent | 1b29b503309cdd1f12a1b9d56b4c695a8ed84d2a (diff) | |
| download | chat-caf9c2409935124db85daf5b04d61b7a663ebfc8.tar.gz chat-caf9c2409935124db85daf5b04d61b7a663ebfc8.tar.bz2 chat-caf9c2409935124db85daf5b04d61b7a663ebfc8.zip | |
MM-9688: Better error message for plugin enabling in HA mode (#8433)
* better error message for plugin enabling in HA mode
* wording update
| -rw-r--r-- | app/plugin.go | 3 | ||||
| -rw-r--r-- | i18n/en.json | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/plugin.go b/app/plugin.go index 22d333679..6702e9227 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -318,6 +318,9 @@ func (a *App) EnablePlugin(id string) *model.AppError { }) if err := a.SaveConfig(a.Config(), true); err != nil { + if err.Id == "ent.cluster.save_config.error" { + return model.NewAppError("EnablePlugin", "app.plugin.cluster.save_config.app_error", nil, "", http.StatusInternalServerError) + } return model.NewAppError("EnablePlugin", "app.plugin.config.app_error", nil, err.Error(), http.StatusInternalServerError) } diff --git a/i18n/en.json b/i18n/en.json index ed4d9dcf6..900b55170 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3707,6 +3707,10 @@ "translation": "Error saving plugin state in config" }, { + "id": "app.plugin.cluster.save_config.app_error", + "translation": "The plugin configuration in your config.json file must be updated manually when using ReadOnlyConfig with clustering enabled." + }, + { "id": "app.plugin.deactivate.app_error", "translation": "Unable to deactivate plugin" }, |