diff options
author | George Goldberg <george@gberg.me> | 2017-09-18 18:31:31 +0100 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-18 13:31:31 -0400 |
commit | 61d0078e0adade4d3670dd25975529a5f0c3bc98 (patch) | |
tree | 2f73586ec1955eedad424719f18517043ba70109 /store/sql_cluster_discovery_store.go | |
parent | 29e917486af2ff26b85c56b3323ca2fbc7309352 (diff) | |
download | chat-61d0078e0adade4d3670dd25975529a5f0c3bc98.tar.gz chat-61d0078e0adade4d3670dd25975529a5f0c3bc98.tar.bz2 chat-61d0078e0adade4d3670dd25975529a5f0c3bc98.zip |
Add error codes to the remaining stores (Part 2). (#7462)
Diffstat (limited to 'store/sql_cluster_discovery_store.go')
-rw-r--r-- | store/sql_cluster_discovery_store.go | 14 |
1 files changed, 8 insertions, 6 deletions
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 |