From 1a2a02440c4e66d7f4869f3d24b4731c8df81fcf Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Fri, 25 Aug 2017 11:04:37 +0100 Subject: Other Packages: NewLocAppError -> NewAppError (#7283) --- manualtesting/manual_testing.go | 2 +- manualtesting/test_autolink.go | 3 ++- utils/config.go | 17 +++++++++-------- utils/mail.go | 21 +++++++++++---------- wsapi/websocket_handler.go | 3 ++- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index 4e6baf8b0..6d16492d8 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -39,7 +39,7 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) { // URL Parameters params, err := url.ParseQuery(r.URL.RawQuery) if err != nil { - c.Err = model.NewLocAppError("/manual", "manaultesting.manual_test.parse.app_error", nil, "") + c.Err = model.NewAppError("/manual", "manaultesting.manual_test.parse.app_error", nil, "", http.StatusBadRequest) return } diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go index 190185835..a2e02dc96 100644 --- a/manualtesting/test_autolink.go +++ b/manualtesting/test_autolink.go @@ -7,6 +7,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + "net/http" ) const LINK_POST_TEXT = ` @@ -24,7 +25,7 @@ func testAutoLink(env TestEnvironment) *model.AppError { l4g.Info(utils.T("manaultesting.test_autolink.info")) channelID, err := getChannelID(model.DEFAULT_CHANNEL, env.CreatedTeamId, env.CreatedUserId) if err != true { - return model.NewLocAppError("/manualtest", "manaultesting.test_autolink.unable.app_error", nil, "") + return model.NewAppError("/manualtest", "manaultesting.test_autolink.unable.app_error", nil, "", http.StatusInternalServerError) } post := &model.Post{ diff --git a/utils/config.go b/utils/config.go index aa5b50146..af15c5e93 100644 --- a/utils/config.go +++ b/utils/config.go @@ -21,6 +21,7 @@ import ( "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" + "net/http" ) const ( @@ -179,14 +180,14 @@ func SaveConfig(fileName string, config *model.Config) *model.AppError { b, err := json.MarshalIndent(config, "", " ") if err != nil { - return model.NewLocAppError("SaveConfig", "utils.config.save_config.saving.app_error", - map[string]interface{}{"Filename": fileName}, err.Error()) + return model.NewAppError("SaveConfig", "utils.config.save_config.saving.app_error", + map[string]interface{}{"Filename": fileName}, err.Error(), http.StatusBadRequest) } err = ioutil.WriteFile(fileName, b, 0644) if err != nil { - return model.NewLocAppError("SaveConfig", "utils.config.save_config.saving.app_error", - map[string]interface{}{"Filename": fileName}, err.Error()) + return model.NewAppError("SaveConfig", "utils.config.save_config.saving.app_error", + map[string]interface{}{"Filename": fileName}, err.Error(), http.StatusInternalServerError) } return nil @@ -592,12 +593,12 @@ func ValidateLocales(cfg *model.Config) *model.AppError { locales := GetSupportedLocales() if _, ok := locales[*cfg.LocalizationSettings.DefaultServerLocale]; !ok { *cfg.LocalizationSettings.DefaultServerLocale = model.DEFAULT_LOCALE - err = model.NewLocAppError("ValidateLocales", "utils.config.supported_server_locale.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.supported_server_locale.app_error", nil, "", http.StatusBadRequest) } if _, ok := locales[*cfg.LocalizationSettings.DefaultClientLocale]; !ok { *cfg.LocalizationSettings.DefaultClientLocale = model.DEFAULT_LOCALE - err = model.NewLocAppError("ValidateLocales", "utils.config.supported_client_locale.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.supported_client_locale.app_error", nil, "", http.StatusBadRequest) } if len(*cfg.LocalizationSettings.AvailableLocales) > 0 { @@ -606,7 +607,7 @@ func ValidateLocales(cfg *model.Config) *model.AppError { if _, ok := locales[word]; !ok { *cfg.LocalizationSettings.AvailableLocales = "" isDefaultClientLocaleInAvailableLocales = true - err = model.NewLocAppError("ValidateLocales", "utils.config.supported_available_locales.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.supported_available_locales.app_error", nil, "", http.StatusBadRequest) break } @@ -619,7 +620,7 @@ func ValidateLocales(cfg *model.Config) *model.AppError { if !isDefaultClientLocaleInAvailableLocales { availableLocales += "," + *cfg.LocalizationSettings.DefaultClientLocale - err = model.NewLocAppError("ValidateLocales", "utils.config.add_client_locale.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.add_client_locale.app_error", nil, "", http.StatusBadRequest) } *cfg.LocalizationSettings.AvailableLocales = strings.Join(RemoveDuplicatesFromStringArray(strings.Split(availableLocales, ",")), ",") diff --git a/utils/mail.go b/utils/mail.go index 6e87e5731..b23e8c774 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -16,6 +16,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/html2text" "github.com/mattermost/platform/model" + "net/http" ) func encodeRFC2047Word(s string) string { @@ -34,12 +35,12 @@ func connectToSMTPServer(config *model.Config) (net.Conn, *model.AppError) { conn, err = tls.Dial("tcp", config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort, tlsconfig) if err != nil { - return nil, model.NewLocAppError("SendMail", "utils.mail.connect_smtp.open_tls.app_error", nil, err.Error()) + return nil, model.NewAppError("SendMail", "utils.mail.connect_smtp.open_tls.app_error", nil, err.Error(), http.StatusInternalServerError) } } else { conn, err = net.Dial("tcp", config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort) if err != nil { - return nil, model.NewLocAppError("SendMail", "utils.mail.connect_smtp.open.app_error", nil, err.Error()) + return nil, model.NewAppError("SendMail", "utils.mail.connect_smtp.open.app_error", nil, err.Error(), http.StatusInternalServerError) } } @@ -50,7 +51,7 @@ func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.Ap c, err := smtp.NewClient(conn, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort) if err != nil { l4g.Error(T("utils.mail.new_client.open.error"), err) - return nil, model.NewLocAppError("SendMail", "utils.mail.connect_smtp.open_tls.app_error", nil, err.Error()) + return nil, model.NewAppError("SendMail", "utils.mail.connect_smtp.open_tls.app_error", nil, err.Error(), http.StatusInternalServerError) } hostname := GetHostnameFromSiteURL(*config.ServiceSettings.SiteURL) @@ -58,7 +59,7 @@ func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.Ap err := c.Hello(hostname) if err != nil { l4g.Error(T("utils.mail.new_client.helo.error"), err) - return nil, model.NewLocAppError("SendMail", "utils.mail.connect_smtp.helo.app_error", nil, err.Error()) + return nil, model.NewAppError("SendMail", "utils.mail.connect_smtp.helo.app_error", nil, err.Error(), http.StatusInternalServerError) } } @@ -74,7 +75,7 @@ func newSMTPClient(conn net.Conn, config *model.Config) (*smtp.Client, *model.Ap auth := smtp.PlainAuth("", config.EmailSettings.SMTPUsername, config.EmailSettings.SMTPPassword, config.EmailSettings.SMTPServer+":"+config.EmailSettings.SMTPPort) if err = c.Auth(auth); err != nil { - return nil, model.NewLocAppError("SendMail", "utils.mail.new_client.auth.app_error", nil, err.Error()) + return nil, model.NewAppError("SendMail", "utils.mail.new_client.auth.app_error", nil, err.Error(), http.StatusInternalServerError) } } return c, nil @@ -148,25 +149,25 @@ func SendMailUsingConfig(to, subject, htmlBody string, config *model.Config) *mo defer c.Close() if err := c.Mail(fromMail.Address); err != nil { - return model.NewLocAppError("SendMail", "utils.mail.send_mail.from_address.app_error", nil, err.Error()) + return model.NewAppError("SendMail", "utils.mail.send_mail.from_address.app_error", nil, err.Error(), http.StatusInternalServerError) } if err := c.Rcpt(to); err != nil { - return model.NewLocAppError("SendMail", "utils.mail.send_mail.to_address.app_error", nil, err.Error()) + return model.NewAppError("SendMail", "utils.mail.send_mail.to_address.app_error", nil, err.Error(), http.StatusInternalServerError) } w, err := c.Data() if err != nil { - return model.NewLocAppError("SendMail", "utils.mail.send_mail.msg_data.app_error", nil, err.Error()) + return model.NewAppError("SendMail", "utils.mail.send_mail.msg_data.app_error", nil, err.Error(), http.StatusInternalServerError) } _, err = m.WriteTo(w) if err != nil { - return model.NewLocAppError("SendMail", "utils.mail.send_mail.msg.app_error", nil, err.Error()) + return model.NewAppError("SendMail", "utils.mail.send_mail.msg.app_error", nil, err.Error(), http.StatusInternalServerError) } err = w.Close() if err != nil { - return model.NewLocAppError("SendMail", "utils.mail.send_mail.close.app_error", nil, err.Error()) + return model.NewAppError("SendMail", "utils.mail.send_mail.close.app_error", nil, err.Error(), http.StatusInternalServerError) } return nil diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go index bbad142b3..d137ec7fc 100644 --- a/wsapi/websocket_handler.go +++ b/wsapi/websocket_handler.go @@ -9,6 +9,7 @@ import ( "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + "net/http" ) func ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler { @@ -54,5 +55,5 @@ func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketR } func NewInvalidWebSocketParamError(action string, name string) *model.AppError { - return model.NewLocAppError("/api/v3/users/websocket:"+action, "api.websocket_handler.invalid_param.app_error", map[string]interface{}{"Name": name}, "") + return model.NewAppError("/api/v3/users/websocket:"+action, "api.websocket_handler.invalid_param.app_error", map[string]interface{}{"Name": name}, "", http.StatusBadRequest) } -- cgit v1.2.3-1-g7c22