summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
Diffstat (limited to 'store')
-rw-r--r--store/sql_channel_store_test.go20
-rw-r--r--store/sql_status_store_test.go8
-rw-r--r--store/sql_store.go20
-rw-r--r--store/sql_user_store_test.go2
4 files changed, 24 insertions, 26 deletions
diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index 03fc50857..002f9cb66 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -1062,9 +1062,9 @@ func TestGetMemberCount(t *testing.T) {
Must(store.Channel().SaveMember(&m1))
if result := <-store.Channel().GetMemberCount(c1.Id, false); result.Err != nil {
- t.Fatal("failed to get member count: %v", result.Err)
+ t.Fatalf("failed to get member count: %v", result.Err)
} else if result.Data.(int64) != 1 {
- t.Fatal("got incorrect member count %v", result.Data)
+ t.Fatalf("got incorrect member count %v", result.Data)
}
u2 := model.User{
@@ -1082,9 +1082,9 @@ func TestGetMemberCount(t *testing.T) {
Must(store.Channel().SaveMember(&m2))
if result := <-store.Channel().GetMemberCount(c1.Id, false); result.Err != nil {
- t.Fatal("failed to get member count: %v", result.Err)
+ t.Fatalf("failed to get member count: %v", result.Err)
} else if result.Data.(int64) != 2 {
- t.Fatal("got incorrect member count %v", result.Data)
+ t.Fatalf("got incorrect member count %v", result.Data)
}
// make sure members of other channels aren't counted
@@ -1103,9 +1103,9 @@ func TestGetMemberCount(t *testing.T) {
Must(store.Channel().SaveMember(&m3))
if result := <-store.Channel().GetMemberCount(c1.Id, false); result.Err != nil {
- t.Fatal("failed to get member count: %v", result.Err)
+ t.Fatalf("failed to get member count: %v", result.Err)
} else if result.Data.(int64) != 2 {
- t.Fatal("got incorrect member count %v", result.Data)
+ t.Fatalf("got incorrect member count %v", result.Data)
}
// make sure inactive users aren't counted
@@ -1124,9 +1124,9 @@ func TestGetMemberCount(t *testing.T) {
Must(store.Channel().SaveMember(&m4))
if result := <-store.Channel().GetMemberCount(c1.Id, false); result.Err != nil {
- t.Fatal("failed to get member count: %v", result.Err)
+ t.Fatalf("failed to get member count: %v", result.Err)
} else if result.Data.(int64) != 2 {
- t.Fatal("got incorrect member count %v", result.Data)
+ t.Fatalf("got incorrect member count %v", result.Data)
}
}
@@ -1169,14 +1169,14 @@ func TestUpdateExtrasByUser(t *testing.T) {
Must(store.User().Update(u1, true))
if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
- t.Fatal("failed to update extras by user: %v", result.Err)
+ t.Fatalf("failed to update extras by user: %v", result.Err)
}
u1.DeleteAt = 0
Must(store.User().Update(u1, true))
if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
- t.Fatal("failed to update extras by user: %v", result.Err)
+ t.Fatalf("failed to update extras by user: %v", result.Err)
}
}
diff --git a/store/sql_status_store_test.go b/store/sql_status_store_test.go
index dce973850..47561cda0 100644
--- a/store/sql_status_store_test.go
+++ b/store/sql_status_store_test.go
@@ -12,7 +12,7 @@ import (
func TestSqlStatusStore(t *testing.T) {
Setup()
- status := &model.Status{model.NewId(), model.STATUS_ONLINE, false, 0, ""}
+ status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
if err := (<-store.Status().SaveOrUpdate(status)).Err; err != nil {
t.Fatal(err)
@@ -28,12 +28,12 @@ func TestSqlStatusStore(t *testing.T) {
t.Fatal(err)
}
- status2 := &model.Status{model.NewId(), model.STATUS_AWAY, false, 0, ""}
+ status2 := &model.Status{UserId: model.NewId(), Status: model.STATUS_AWAY, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
if err := (<-store.Status().SaveOrUpdate(status2)).Err; err != nil {
t.Fatal(err)
}
- status3 := &model.Status{model.NewId(), model.STATUS_OFFLINE, false, 0, ""}
+ status3 := &model.Status{UserId: model.NewId(), Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
if err := (<-store.Status().SaveOrUpdate(status3)).Err; err != nil {
t.Fatal(err)
}
@@ -90,7 +90,7 @@ func TestSqlStatusStore(t *testing.T) {
func TestActiveUserCount(t *testing.T) {
Setup()
- status := &model.Status{model.NewId(), model.STATUS_ONLINE, false, model.GetMillis(), ""}
+ status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
Must(store.Status().SaveOrUpdate(status))
if result := <-store.Status().GetTotalActiveUsersCount(); result.Err != nil {
diff --git a/store/sql_store.go b/store/sql_store.go
index 214bce720..03867cc44 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -220,16 +220,14 @@ func (ss *SqlStore) TotalReadDbConnections() int {
if len(utils.Cfg.SqlSettings.DataSourceReplicas) == 0 {
return 0
- } else {
- count := 0
- for _, db := range ss.replicas {
- count = count + db.Db.Stats().OpenConnections
- }
+ }
- return count
+ count := 0
+ for _, db := range ss.replicas {
+ count = count + db.Db.Stats().OpenConnections
}
- return 0
+ return count
}
func (ss *SqlStore) GetCurrentSchemaVersion() string {
@@ -722,7 +720,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool)
b := []byte(*s)
return json.Unmarshal(b, target)
}
- return gorp.CustomScanner{new(string), target, binder}, true
+ return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true
case *model.StringArray:
binder := func(holder, target interface{}) error {
s, ok := holder.(*string)
@@ -732,7 +730,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool)
b := []byte(*s)
return json.Unmarshal(b, target)
}
- return gorp.CustomScanner{new(string), target, binder}, true
+ return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true
case *model.EncryptStringMap:
binder := func(holder, target interface{}) error {
s, ok := holder.(*string)
@@ -748,7 +746,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool)
b := []byte(ue)
return json.Unmarshal(b, target)
}
- return gorp.CustomScanner{new(string), target, binder}, true
+ return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true
case *model.StringInterface:
binder := func(holder, target interface{}) error {
s, ok := holder.(*string)
@@ -758,7 +756,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool)
b := []byte(*s)
return json.Unmarshal(b, target)
}
- return gorp.CustomScanner{new(string), target, binder}, true
+ return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true
}
return gorp.CustomScanner{}, false
diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go
index 95be3e258..f7236659b 100644
--- a/store/sql_user_store_test.go
+++ b/store/sql_user_store_test.go
@@ -1103,7 +1103,7 @@ func TestUserStoreGetRecentlyActiveUsersForTeam(t *testing.T) {
u1 := &model.User{}
u1.Email = model.NewId()
Must(store.User().Save(u1))
- Must(store.Status().SaveOrUpdate(&model.Status{u1.Id, model.STATUS_ONLINE, false, model.GetMillis(), ""}))
+ Must(store.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}))
tid := model.NewId()
Must(store.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}))
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-02 21:04:33 +0000