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 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'store/sql_audit_store.go') 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 -- cgit v1.2.3-1-g7c22