From caf9c2409935124db85daf5b04d61b7a663ebfc8 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 13 Mar 2018 11:03:12 -0500 Subject: MM-9688: Better error message for plugin enabling in HA mode (#8433) * better error message for plugin enabling in HA mode * wording update --- app/plugin.go | 3 +++ i18n/en.json | 4 ++++ 2 files changed, 7 insertions(+) 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 @@ -3706,6 +3706,10 @@ "id": "app.plugin.config.app_error", "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" -- cgit v1.2.3-1-g7c22