From 61d0078e0adade4d3670dd25975529a5f0c3bc98 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Mon, 18 Sep 2017 18:31:31 +0100 Subject: Add error codes to the remaining stores (Part 2). (#7462) --- store/sql_audit_store.go | 10 ++++----- store/sql_cluster_discovery_store.go | 14 +++++++------ store/sql_command_store.go | 20 +++++++++--------- store/sql_command_webhook_store.go | 11 +++++----- store/sql_compliance_store.go | 13 ++++++------ store/sql_emoji_store.go | 8 ++++---- store/sql_file_info_store.go | 2 +- store/sql_job_store.go | 39 ++++++++++++------------------------ store/sql_license_store.go | 8 +++++--- 9 files changed, 58 insertions(+), 67 deletions(-) (limited to 'store') diff --git a/store/sql_audit_store.go b/store/sql_audit_store.go index 1eb4e4819..e76d1037f 100644 --- a/store/sql_audit_store.go +++ b/store/sql_audit_store.go @@ -45,9 +45,7 @@ func (s SqlAuditStore) Save(audit *model.Audit) StoreChannel { audit.CreateAt = model.GetMillis() if err := s.GetMaster().Insert(audit); err != nil { - result.Err = model.NewLocAppError("SqlAuditStore.Save", - "store.sql_audit.save.saving.app_error", nil, "user_id="+ - audit.UserId+" action="+audit.Action) + result.Err = model.NewAppError("SqlAuditStore.Save", "store.sql_audit.save.saving.app_error", nil, "user_id="+audit.UserId+" action="+audit.Action, http.StatusInternalServerError) } storeChannel <- result @@ -66,7 +64,7 @@ func (s SqlAuditStore) Get(user_id string, offset int, limit int) StoreChannel { if limit > 1000 { limit = 1000 - result.Err = model.NewLocAppError("SqlAuditStore.Get", "store.sql_audit.get.limit.app_error", nil, "user_id="+user_id) + result.Err = model.NewAppError("SqlAuditStore.Get", "store.sql_audit.get.limit.app_error", nil, "user_id="+user_id, http.StatusBadRequest) storeChannel <- result close(storeChannel) return @@ -82,7 +80,7 @@ func (s SqlAuditStore) Get(user_id string, offset int, limit int) StoreChannel { var audits model.Audits if _, err := s.GetReplica().Select(&audits, query, map[string]interface{}{"user_id": user_id, "limit": limit, "offset": offset}); err != nil { - result.Err = model.NewLocAppError("SqlAuditStore.Get", "store.sql_audit.get.finding.app_error", nil, "user_id="+user_id) + result.Err = model.NewAppError("SqlAuditStore.Get", "store.sql_audit.get.finding.app_error", nil, "user_id="+user_id, http.StatusInternalServerError) } else { result.Data = audits } @@ -103,7 +101,7 @@ func (s SqlAuditStore) PermanentDeleteByUser(userId string) StoreChannel { if _, err := s.GetMaster().Exec("DELETE FROM Audits WHERE UserId = :userId", map[string]interface{}{"userId": userId}); err != nil { - result.Err = model.NewLocAppError("SqlAuditStore.Delete", "store.sql_audit.permanent_delete_by_user.app_error", nil, "user_id="+userId) + result.Err = model.NewAppError("SqlAuditStore.Delete", "store.sql_audit.permanent_delete_by_user.app_error", nil, "user_id="+userId, http.StatusInternalServerError) } storeChannel <- result diff --git a/store/sql_cluster_discovery_store.go b/store/sql_cluster_discovery_store.go index 3c918dc28..d410ee73a 100644 --- a/store/sql_cluster_discovery_store.go +++ b/store/sql_cluster_discovery_store.go @@ -4,6 +4,8 @@ package store import ( + "net/http" + "github.com/mattermost/mattermost-server/model" ) @@ -40,7 +42,7 @@ func (s sqlClusterDiscoveryStore) Save(ClusterDiscovery *model.ClusterDiscovery) } if err := s.GetMaster().Insert(ClusterDiscovery); err != nil { - result.Err = model.NewLocAppError("SqlClusterDiscoveryStore.Save", "Failed to save ClusterDiscovery row", nil, err.Error()) + result.Err = model.NewAppError("SqlClusterDiscoveryStore.Save", "Failed to save ClusterDiscovery row", nil, err.Error(), http.StatusInternalServerError) } storeChannel <- result @@ -73,7 +75,7 @@ func (s sqlClusterDiscoveryStore) Delete(ClusterDiscovery *model.ClusterDiscover "Hostname": ClusterDiscovery.Hostname, }, ); err != nil { - result.Err = model.NewLocAppError("SqlClusterDiscoveryStore.Delete", "Failed to delete", nil, err.Error()) + result.Err = model.NewAppError("SqlClusterDiscoveryStore.Delete", "Failed to delete", nil, err.Error(), http.StatusInternalServerError) } else { if count > 0 { result.Data = true @@ -111,7 +113,7 @@ func (s sqlClusterDiscoveryStore) Exists(ClusterDiscovery *model.ClusterDiscover "Hostname": ClusterDiscovery.Hostname, }, ); err != nil { - result.Err = model.NewLocAppError("SqlClusterDiscoveryStore.Exists", "Failed to check if it exists", nil, err.Error()) + result.Err = model.NewAppError("SqlClusterDiscoveryStore.Exists", "Failed to check if it exists", nil, err.Error(), http.StatusInternalServerError) } else { if count > 0 { result.Data = true @@ -153,7 +155,7 @@ func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName strin "LastPingAt": lastPingAt, }, ); err != nil { - result.Err = model.NewLocAppError("SqlClusterDiscoveryStore.GetAllForType", "Failed to get all disoery rows", nil, err.Error()) + result.Err = model.NewAppError("SqlClusterDiscoveryStore.GetAllForType", "Failed to get all disoery rows", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = list } @@ -188,7 +190,7 @@ func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterD "Hostname": ClusterDiscovery.Hostname, }, ); err != nil { - result.Err = model.NewLocAppError("SqlClusterDiscoveryStore.GetAllForType", "Failed to update last ping at", nil, err.Error()) + result.Err = model.NewAppError("SqlClusterDiscoveryStore.GetAllForType", "Failed to update last ping at", nil, err.Error(), http.StatusInternalServerError) } storeChannel <- result @@ -215,7 +217,7 @@ func (s sqlClusterDiscoveryStore) Cleanup() StoreChannel { "LastPingAt": model.GetMillis() - model.CDS_OFFLINE_AFTER_MILLIS, }, ); err != nil { - result.Err = model.NewLocAppError("SqlClusterDiscoveryStore.Save", "Failed to save ClusterDiscovery row", nil, err.Error()) + result.Err = model.NewAppError("SqlClusterDiscoveryStore.Save", "Failed to save ClusterDiscovery row", nil, err.Error(), http.StatusInternalServerError) } storeChannel <- result diff --git a/store/sql_command_store.go b/store/sql_command_store.go index a767e764d..443e3ba63 100644 --- a/store/sql_command_store.go +++ b/store/sql_command_store.go @@ -4,6 +4,8 @@ package store import ( + "net/http" + "github.com/mattermost/mattermost-server/model" ) @@ -48,7 +50,7 @@ func (s SqlCommandStore) Save(command *model.Command) StoreChannel { result := StoreResult{} if len(command.Id) > 0 { - result.Err = model.NewLocAppError("SqlCommandStore.Save", "store.sql_command.save.saving_overwrite.app_error", nil, "id="+command.Id) + result.Err = model.NewAppError("SqlCommandStore.Save", "store.sql_command.save.saving_overwrite.app_error", nil, "id="+command.Id, http.StatusBadRequest) storeChannel <- result close(storeChannel) return @@ -62,7 +64,7 @@ func (s SqlCommandStore) Save(command *model.Command) StoreChannel { } if err := s.GetMaster().Insert(command); err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.Save", "store.sql_command.save.saving.app_error", nil, "id="+command.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.Save", "store.sql_command.save.saving.app_error", nil, "id="+command.Id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = command } @@ -83,7 +85,7 @@ func (s SqlCommandStore) Get(id string) StoreChannel { var command model.Command if err := s.GetReplica().SelectOne(&command, "SELECT * FROM Commands WHERE Id = :Id AND DeleteAt = 0", map[string]interface{}{"Id": id}); err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.Get", "store.sql_command.save.get.app_error", nil, "id="+id+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.Get", "store.sql_command.save.get.app_error", nil, "id="+id+", err="+err.Error(), http.StatusInternalServerError) } result.Data = &command @@ -104,7 +106,7 @@ func (s SqlCommandStore) GetByTeam(teamId string) StoreChannel { var commands []*model.Command if _, err := s.GetReplica().Select(&commands, "SELECT * FROM Commands WHERE TeamId = :TeamId AND DeleteAt = 0", map[string]interface{}{"TeamId": teamId}); err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.GetByTeam", "store.sql_command.save.get_team.app_error", nil, "teamId="+teamId+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.GetByTeam", "store.sql_command.save.get_team.app_error", nil, "teamId="+teamId+", err="+err.Error(), http.StatusInternalServerError) } result.Data = commands @@ -124,7 +126,7 @@ func (s SqlCommandStore) Delete(commandId string, time int64) StoreChannel { _, err := s.GetMaster().Exec("Update Commands SET DeleteAt = :DeleteAt, UpdateAt = :UpdateAt WHERE Id = :Id", map[string]interface{}{"DeleteAt": time, "UpdateAt": time, "Id": commandId}) if err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.Delete", "store.sql_command.save.delete.app_error", nil, "id="+commandId+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.Delete", "store.sql_command.save.delete.app_error", nil, "id="+commandId+", err="+err.Error(), http.StatusInternalServerError) } storeChannel <- result @@ -142,7 +144,7 @@ func (s SqlCommandStore) PermanentDeleteByTeam(teamId string) StoreChannel { _, err := s.GetMaster().Exec("DELETE FROM Commands WHERE TeamId = :TeamId", map[string]interface{}{"TeamId": teamId}) if err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.DeleteByTeam", "store.sql_command.save.delete_perm.app_error", nil, "id="+teamId+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.DeleteByTeam", "store.sql_command.save.delete_perm.app_error", nil, "id="+teamId+", err="+err.Error(), http.StatusInternalServerError) } storeChannel <- result @@ -160,7 +162,7 @@ func (s SqlCommandStore) PermanentDeleteByUser(userId string) StoreChannel { _, err := s.GetMaster().Exec("DELETE FROM Commands WHERE CreatorId = :UserId", map[string]interface{}{"UserId": userId}) if err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.DeleteByUser", "store.sql_command.save.delete_perm.app_error", nil, "id="+userId+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.DeleteByUser", "store.sql_command.save.delete_perm.app_error", nil, "id="+userId+", err="+err.Error(), http.StatusInternalServerError) } storeChannel <- result @@ -179,7 +181,7 @@ func (s SqlCommandStore) Update(cmd *model.Command) StoreChannel { cmd.UpdateAt = model.GetMillis() if _, err := s.GetMaster().Update(cmd); err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.Update", "store.sql_command.save.update.app_error", nil, "id="+cmd.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlCommandStore.Update", "store.sql_command.save.update.app_error", nil, "id="+cmd.Id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = cmd } @@ -210,7 +212,7 @@ func (s SqlCommandStore) AnalyticsCommandCount(teamId string) StoreChannel { } if c, err := s.GetReplica().SelectInt(query, map[string]interface{}{"TeamId": teamId}); err != nil { - result.Err = model.NewLocAppError("SqlCommandStore.AnalyticsCommandCount", "store.sql_command.analytics_command_count.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlCommandStore.AnalyticsCommandCount", "store.sql_command.analytics_command_count.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = c } diff --git a/store/sql_command_webhook_store.go b/store/sql_command_webhook_store.go index 925be60ee..801950735 100644 --- a/store/sql_command_webhook_store.go +++ b/store/sql_command_webhook_store.go @@ -4,9 +4,8 @@ package store import ( - "net/http" - "database/sql" + "net/http" l4g "github.com/alecthomas/log4go" @@ -44,7 +43,7 @@ func (s SqlCommandWebhookStore) Save(webhook *model.CommandWebhook) StoreChannel result := StoreResult{} if len(webhook.Id) > 0 { - result.Err = model.NewLocAppError("SqlCommandWebhookStore.Save", "store.sql_command_webhooks.save.existing.app_error", nil, "id="+webhook.Id) + result.Err = model.NewAppError("SqlCommandWebhookStore.Save", "store.sql_command_webhooks.save.existing.app_error", nil, "id="+webhook.Id, http.StatusBadRequest) storeChannel <- result close(storeChannel) return @@ -58,7 +57,7 @@ func (s SqlCommandWebhookStore) Save(webhook *model.CommandWebhook) StoreChannel } if err := s.GetMaster().Insert(webhook); err != nil { - result.Err = model.NewLocAppError("SqlCommandWebhookStore.Save", "store.sql_command_webhooks.save.app_error", nil, "id="+webhook.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlCommandWebhookStore.Save", "store.sql_command_webhooks.save.app_error", nil, "id="+webhook.Id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = webhook } @@ -80,7 +79,7 @@ func (s SqlCommandWebhookStore) Get(id string) StoreChannel { exptime := model.GetMillis() - model.COMMAND_WEBHOOK_LIFETIME if err := s.GetReplica().SelectOne(&webhook, "SELECT * FROM CommandWebhooks WHERE Id = :Id AND CreateAt > :ExpTime", map[string]interface{}{"Id": id, "ExpTime": exptime}); err != nil { - result.Err = model.NewLocAppError("SqlCommandWebhookStore.Get", "store.sql_command_webhooks.get.app_error", nil, "id="+id+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandWebhookStore.Get", "store.sql_command_webhooks.get.app_error", nil, "id="+id+", err="+err.Error(), http.StatusInternalServerError) if err == sql.ErrNoRows { result.Err.StatusCode = http.StatusNotFound } @@ -102,7 +101,7 @@ func (s SqlCommandWebhookStore) TryUse(id string, limit int) StoreChannel { result := StoreResult{} if sqlResult, err := s.GetMaster().Exec("UPDATE CommandWebhooks SET UseCount = UseCount + 1 WHERE Id = :Id AND UseCount < :UseLimit", map[string]interface{}{"Id": id, "UseLimit": limit}); err != nil { - result.Err = model.NewLocAppError("SqlCommandWebhookStore.TryUse", "store.sql_command_webhooks.try_use.app_error", nil, "id="+id+", err="+err.Error()) + result.Err = model.NewAppError("SqlCommandWebhookStore.TryUse", "store.sql_command_webhooks.try_use.app_error", nil, "id="+id+", err="+err.Error(), http.StatusInternalServerError) } else if rows, _ := sqlResult.RowsAffected(); rows == 0 { result.Err = model.NewAppError("SqlCommandWebhookStore.TryUse", "store.sql_command_webhooks.try_use.invalid.app_error", nil, "id="+id, http.StatusBadRequest) } diff --git a/store/sql_compliance_store.go b/store/sql_compliance_store.go index 9c1c7dc90..73015d47f 100644 --- a/store/sql_compliance_store.go +++ b/store/sql_compliance_store.go @@ -4,6 +4,7 @@ package store import ( + "net/http" "strconv" "strings" @@ -49,7 +50,7 @@ func (s SqlComplianceStore) Save(compliance *model.Compliance) StoreChannel { } if err := s.GetMaster().Insert(compliance); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Save", "store.sql_compliance.save.saving.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Save", "store.sql_compliance.save.saving.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = compliance } @@ -75,7 +76,7 @@ func (us SqlComplianceStore) Update(compliance *model.Compliance) StoreChannel { } if _, err := us.GetMaster().Update(compliance); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Update", "store.sql_compliance.save.saving.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Update", "store.sql_compliance.save.saving.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = compliance } @@ -98,7 +99,7 @@ func (s SqlComplianceStore) GetAll(offset, limit int) StoreChannel { var compliances model.Compliances if _, err := s.GetReplica().Select(&compliances, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = compliances } @@ -118,9 +119,9 @@ func (us SqlComplianceStore) Get(id string) StoreChannel { result := StoreResult{} if obj, err := us.GetReplica().Get(model.Compliance{}, id); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error(), http.StatusInternalServerError) } else if obj == nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error(), http.StatusNotFound) } else { result.Data = obj.(*model.Compliance) } @@ -252,7 +253,7 @@ func (s SqlComplianceStore) ComplianceExport(job *model.Compliance) StoreChannel var cposts []*model.CompliancePost if _, err := s.GetReplica().Select(&cposts, query, props); err != nil { - result.Err = model.NewLocAppError("SqlPostStore.ComplianceExport", "store.sql_post.compliance_export.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlPostStore.ComplianceExport", "store.sql_post.compliance_export.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = cposts } diff --git a/store/sql_emoji_store.go b/store/sql_emoji_store.go index efab82d1f..dc67be795 100644 --- a/store/sql_emoji_store.go +++ b/store/sql_emoji_store.go @@ -61,7 +61,7 @@ func (es SqlEmojiStore) Save(emoji *model.Emoji) StoreChannel { } if err := es.GetMaster().Insert(emoji); err != nil { - result.Err = model.NewLocAppError("SqlEmojiStore.Save", "store.sql_emoji.save.app_error", nil, "id="+emoji.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlEmojiStore.Save", "store.sql_emoji.save.app_error", nil, "id="+emoji.Id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = emoji } @@ -141,7 +141,7 @@ func (es SqlEmojiStore) GetByName(name string) StoreChannel { WHERE Name = :Name AND DeleteAt = 0`, map[string]interface{}{"Name": name}); err != nil { - result.Err = model.NewLocAppError("SqlEmojiStore.GetByName", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error()) + result.Err = model.NewAppError("SqlEmojiStore.GetByName", "store.sql_emoji.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = emoji } @@ -196,9 +196,9 @@ func (es SqlEmojiStore) Delete(id string, time int64) StoreChannel { WHERE Id = :Id AND DeleteAt = 0`, map[string]interface{}{"DeleteAt": time, "UpdateAt": time, "Id": id}); err != nil { - result.Err = model.NewLocAppError("SqlEmojiStore.Delete", "store.sql_emoji.delete.app_error", nil, "id="+id+", err="+err.Error()) + result.Err = model.NewAppError("SqlEmojiStore.Delete", "store.sql_emoji.delete.app_error", nil, "id="+id+", err="+err.Error(), http.StatusInternalServerError) } else if rows, _ := sqlResult.RowsAffected(); rows == 0 { - result.Err = model.NewLocAppError("SqlEmojiStore.Delete", "store.sql_emoji.delete.no_results", nil, "id="+id+", err="+err.Error()) + result.Err = model.NewAppError("SqlEmojiStore.Delete", "store.sql_emoji.delete.no_results", nil, "id="+id+", err="+err.Error(), http.StatusBadRequest) } emojiCache.Remove(id) diff --git a/store/sql_file_info_store.go b/store/sql_file_info_store.go index 4cd574b13..d09edc731 100644 --- a/store/sql_file_info_store.go +++ b/store/sql_file_info_store.go @@ -70,7 +70,7 @@ func (fs SqlFileInfoStore) Save(info *model.FileInfo) StoreChannel { } if err := fs.GetMaster().Insert(info); err != nil { - result.Err = model.NewLocAppError("SqlFileInfoStore.Save", "store.sql_file_info.save.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlFileInfoStore.Save", "store.sql_file_info.save.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = info } diff --git a/store/sql_job_store.go b/store/sql_job_store.go index ff58ab729..888b087a7 100644 --- a/store/sql_job_store.go +++ b/store/sql_job_store.go @@ -39,8 +39,7 @@ func (jss SqlJobStore) Save(job *model.Job) StoreChannel { go func() { result := StoreResult{} if err := jss.GetMaster().Insert(job); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.Save", - "store.sql_job.save.app_error", nil, "id="+job.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.Save", "store.sql_job.save.app_error", nil, "id="+job.Id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = job } @@ -78,14 +77,12 @@ func (jss SqlJobStore) UpdateOptimistically(job *model.Job, currentStatus string "Data": job.DataToJson(), "Progress": job.Progress, }); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.UpdateOptimistically", - "store.sql_job.update.app_error", nil, "id="+job.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.UpdateOptimistically", "store.sql_job.update.app_error", nil, "id="+job.Id+", "+err.Error(), http.StatusInternalServerError) } else { rows, err := sqlResult.RowsAffected() if err != nil { - result.Err = model.NewLocAppError("SqlJobStore.UpdateStatus", - "store.sql_job.update.app_error", nil, "id="+job.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.UpdateStatus", "store.sql_job.update.app_error", nil, "id="+job.Id+", "+err.Error(), http.StatusInternalServerError) } else { if rows == 1 { result.Data = true @@ -117,8 +114,7 @@ func (jss SqlJobStore) UpdateStatus(id string, status string) StoreChannel { if _, err := jss.GetMaster().UpdateColumns(func(col *gorp.ColumnMap) bool { return col.ColumnName == "Status" || col.ColumnName == "LastActivityAt" }, job); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.UpdateStatus", - "store.sql_job.update.app_error", nil, "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.UpdateStatus", "store.sql_job.update.app_error", nil, "id="+id+", "+err.Error(), http.StatusInternalServerError) } if result.Err == nil { @@ -153,14 +149,12 @@ func (jss SqlJobStore) UpdateStatusOptimistically(id string, currentStatus strin Id = :Id AND Status = :OldStatus`, map[string]interface{}{"Id": id, "OldStatus": currentStatus, "NewStatus": newStatus, "StartAt": model.GetMillis(), "LastActivityAt": model.GetMillis()}); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.UpdateStatus", - "store.sql_job.update.app_error", nil, "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.UpdateStatus", "store.sql_job.update.app_error", nil, "id="+id+", "+err.Error(), http.StatusInternalServerError) } else { rows, err := sqlResult.RowsAffected() if err != nil { - result.Err = model.NewLocAppError("SqlJobStore.UpdateStatus", - "store.sql_job.update.app_error", nil, "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.UpdateStatus", "store.sql_job.update.app_error", nil, "id="+id+", "+err.Error(), http.StatusInternalServerError) } else { if rows == 1 { result.Data = true @@ -193,11 +187,9 @@ func (jss SqlJobStore) Get(id string) StoreChannel { WHERE Id = :Id`, map[string]interface{}{"Id": id}); err != nil { if err == sql.ErrNoRows { - result.Err = model.NewAppError("SqlJobStore.Get", - "store.sql_job.get.app_error", nil, "Id="+id+", "+err.Error(), http.StatusNotFound) + result.Err = model.NewAppError("SqlJobStore.Get", "store.sql_job.get.app_error", nil, "Id="+id+", "+err.Error(), http.StatusNotFound) } else { - result.Err = model.NewAppError("SqlJobStore.Get", - "store.sql_job.get.app_error", nil, "Id="+id+", "+err.Error(), http.StatusInternalServerError) + result.Err = model.NewAppError("SqlJobStore.Get", "store.sql_job.get.app_error", nil, "Id="+id+", "+err.Error(), http.StatusInternalServerError) } } else { result.Data = status @@ -229,8 +221,7 @@ func (jss SqlJobStore) GetAllPage(offset int, limit int) StoreChannel { :Limit OFFSET :Offset`, map[string]interface{}{"Limit": limit, "Offset": offset}); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.GetAllPage", - "store.sql_job.get_all.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlJobStore.GetAllPage", "store.sql_job.get_all.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = statuses } @@ -259,8 +250,7 @@ func (jss SqlJobStore) GetAllByType(jobType string) StoreChannel { Type = :Type ORDER BY CreateAt DESC`, map[string]interface{}{"Type": jobType}); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.GetAllByType", - "store.sql_job.get_all.app_error", nil, "Type="+jobType+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.GetAllByType", "store.sql_job.get_all.app_error", nil, "Type="+jobType+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = statuses } @@ -293,8 +283,7 @@ func (jss SqlJobStore) GetAllByTypePage(jobType string, offset int, limit int) S :Limit OFFSET :Offset`, map[string]interface{}{"Type": jobType, "Limit": limit, "Offset": offset}); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.GetAllByTypePage", - "store.sql_job.get_all.app_error", nil, "Type="+jobType+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.GetAllByTypePage", "store.sql_job.get_all.app_error", nil, "Type="+jobType+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = statuses } @@ -323,8 +312,7 @@ func (jss SqlJobStore) GetAllByStatus(status string) StoreChannel { Status = :Status ORDER BY CreateAt ASC`, map[string]interface{}{"Status": status}); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.GetAllByStatus", - "store.sql_job.get_all.app_error", nil, "Status="+status+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.GetAllByStatus", "store.sql_job.get_all.app_error", nil, "Status="+status+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = statuses } @@ -347,8 +335,7 @@ func (jss SqlJobStore) Delete(id string) StoreChannel { Jobs WHERE Id = :Id`, map[string]interface{}{"Id": id}); err != nil { - result.Err = model.NewLocAppError("SqlJobStore.DeleteByType", - "store.sql_job.delete.app_error", nil, "id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlJobStore.DeleteByType", "store.sql_job.delete.app_error", nil, "id="+id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = id } diff --git a/store/sql_license_store.go b/store/sql_license_store.go index 5dadf2967..09371dc9f 100644 --- a/store/sql_license_store.go +++ b/store/sql_license_store.go @@ -4,6 +4,8 @@ package store import ( + "net/http" + "github.com/mattermost/mattermost-server/model" ) @@ -43,7 +45,7 @@ func (ls SqlLicenseStore) Save(license *model.LicenseRecord) StoreChannel { // Only insert if not exists if err := ls.GetReplica().SelectOne(&model.LicenseRecord{}, "SELECT * FROM Licenses WHERE Id = :Id", map[string]interface{}{"Id": license.Id}); err != nil { if err := ls.GetMaster().Insert(license); err != nil { - result.Err = model.NewLocAppError("SqlLicenseStore.Save", "store.sql_license.save.app_error", nil, "license_id="+license.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlLicenseStore.Save", "store.sql_license.save.app_error", nil, "license_id="+license.Id+", "+err.Error(), http.StatusInternalServerError) } else { result.Data = license } @@ -64,9 +66,9 @@ func (ls SqlLicenseStore) Get(id string) StoreChannel { result := StoreResult{} if obj, err := ls.GetReplica().Get(model.LicenseRecord{}, id); err != nil { - result.Err = model.NewLocAppError("SqlLicenseStore.Get", "store.sql_license.get.app_error", nil, "license_id="+id+", "+err.Error()) + result.Err = model.NewAppError("SqlLicenseStore.Get", "store.sql_license.get.app_error", nil, "license_id="+id+", "+err.Error(), http.StatusInternalServerError) } else if obj == nil { - result.Err = model.NewLocAppError("SqlLicenseStore.Get", "store.sql_license.get.missing.app_error", nil, "license_id="+id) + result.Err = model.NewAppError("SqlLicenseStore.Get", "store.sql_license.get.missing.app_error", nil, "license_id="+id, http.StatusNotFound) } else { result.Data = obj.(*model.LicenseRecord) } -- cgit v1.2.3-1-g7c22