summaryrefslogtreecommitdiffstats
path: root/store/sql_system_store.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-09-20 14:34:50 +0100
committerJoram Wilander <jwawilander@gmail.com>2017-09-20 09:34:50 -0400
commitc3916bb5305b11068ff8a9a754e39f12e33ebcc0 (patch)
tree0f405e45798ca752b1700ca16d645c5e5da25a5b /store/sql_system_store.go
parent2d322a41749849e62eeeb2d0de61b1e94b83b46d (diff)
downloadchat-c3916bb5305b11068ff8a9a754e39f12e33ebcc0.tar.gz
chat-c3916bb5305b11068ff8a9a754e39f12e33ebcc0.tar.bz2
chat-c3916bb5305b11068ff8a9a754e39f12e33ebcc0.zip
Add error codes to the remaining stores (Part 1). (#7461)
Diffstat (limited to 'store/sql_system_store.go')
-rw-r--r--store/sql_system_store.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/store/sql_system_store.go b/store/sql_system_store.go
index 4c9b8bc4e..716292af6 100644
--- a/store/sql_system_store.go
+++ b/store/sql_system_store.go
@@ -4,6 +4,8 @@
package store
import (
+ "net/http"
+
"github.com/mattermost/mattermost-server/model"
)
@@ -34,7 +36,7 @@ func (s SqlSystemStore) Save(system *model.System) StoreChannel {
result := StoreResult{}
if err := s.GetMaster().Insert(system); err != nil {
- result.Err = model.NewLocAppError("SqlSystemStore.Save", "store.sql_system.save.app_error", nil, err.Error())
+ result.Err = model.NewAppError("SqlSystemStore.Save", "store.sql_system.save.app_error", nil, err.Error(), http.StatusInternalServerError)
}
storeChannel <- result
@@ -53,11 +55,11 @@ func (s SqlSystemStore) SaveOrUpdate(system *model.System) StoreChannel {
if err := s.GetReplica().SelectOne(&model.System{}, "SELECT * FROM Systems WHERE Name = :Name", map[string]interface{}{"Name": system.Name}); err == nil {
if _, err := s.GetMaster().Update(system); err != nil {
- result.Err = model.NewLocAppError("SqlSystemStore.SaveOrUpdate", "store.sql_system.update.app_error", nil, "")
+ result.Err = model.NewAppError("SqlSystemStore.SaveOrUpdate", "store.sql_system.update.app_error", nil, "", http.StatusInternalServerError)
}
} else {
if err := s.GetMaster().Insert(system); err != nil {
- result.Err = model.NewLocAppError("SqlSystemStore.SaveOrUpdate", "store.sql_system.save.app_error", nil, "")
+ result.Err = model.NewAppError("SqlSystemStore.SaveOrUpdate", "store.sql_system.save.app_error", nil, "", http.StatusInternalServerError)
}
}
@@ -76,7 +78,7 @@ func (s SqlSystemStore) Update(system *model.System) StoreChannel {
result := StoreResult{}
if _, err := s.GetMaster().Update(system); err != nil {
- result.Err = model.NewLocAppError("SqlSystemStore.Update", "store.sql_system.update.app_error", nil, "")
+ result.Err = model.NewAppError("SqlSystemStore.Update", "store.sql_system.update.app_error", nil, "", http.StatusInternalServerError)
}
storeChannel <- result
@@ -96,7 +98,7 @@ func (s SqlSystemStore) Get() StoreChannel {
var systems []model.System
props := make(model.StringMap)
if _, err := s.GetReplica().Select(&systems, "SELECT * FROM Systems"); err != nil {
- result.Err = model.NewLocAppError("SqlSystemStore.Get", "store.sql_system.get.app_error", nil, "")
+ result.Err = model.NewAppError("SqlSystemStore.Get", "store.sql_system.get.app_error", nil, "", http.StatusInternalServerError)
} else {
for _, prop := range systems {
props[prop.Name] = prop.Value
@@ -121,7 +123,7 @@ func (s SqlSystemStore) GetByName(name string) StoreChannel {
var system model.System
if err := s.GetReplica().SelectOne(&system, "SELECT * FROM Systems WHERE Name = :Name", map[string]interface{}{"Name": name}); err != nil {
- result.Err = model.NewLocAppError("SqlSystemStore.GetByName", "store.sql_system.get_by_name.app_error", nil, "")
+ result.Err = model.NewAppError("SqlSystemStore.GetByName", "store.sql_system.get_by_name.app_error", nil, "", http.StatusInternalServerError)
}
result.Data = &system