summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-09-09 11:46:36 -0700
committerenahum <nahumhbl@gmail.com>2016-09-09 15:46:36 -0300
commit193314e9fca5d23fbfae3c6ead7e5d23b1bea616 (patch)
tree8c7cf0aa4b9f471d86f6305aed1c57ea7792b6b2 /store
parent58cdb17fb9a4137bbbe304fb22b861f7c517c650 (diff)
downloadchat-193314e9fca5d23fbfae3c6ead7e5d23b1bea616.tar.gz
chat-193314e9fca5d23fbfae3c6ead7e5d23b1bea616.tar.bz2
chat-193314e9fca5d23fbfae3c6ead7e5d23b1bea616.zip
Increasing channel limits (#4003)
* Increasing channel limits * Fixing unit test
Diffstat (limited to 'store')
-rw-r--r--store/sql_channel_store.go2
-rw-r--r--store/sql_channel_store_test.go15
2 files changed, 1 insertions, 16 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index acf112f50..2400c34f3 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -155,7 +155,7 @@ func (s SqlChannelStore) saveChannelT(transaction *gorp.Transaction, channel *mo
if count, err := transaction.SelectInt("SELECT COUNT(0) FROM Channels WHERE TeamId = :TeamId AND DeleteAt = 0 AND (Type = 'O' OR Type = 'P')", map[string]interface{}{"TeamId": channel.TeamId}); err != nil {
result.Err = model.NewLocAppError("SqlChannelStore.Save", "store.sql_channel.save_channel.current_count.app_error", nil, "teamId="+channel.TeamId+", "+err.Error())
return result
- } else if count > 1000 {
+ } else if count > 20000 {
result.Err = model.NewLocAppError("SqlChannelStore.Save", "store.sql_channel.save_channel.limit.app_error", nil, "teamId="+channel.TeamId)
return result
}
diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index 0c293972c..6a567f470 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -39,21 +39,6 @@ func TestChannelStoreSave(t *testing.T) {
if err := (<-store.Channel().Save(&o1)).Err; err == nil {
t.Fatal("Should not be able to save direct channel")
}
-
- o1.Type = model.CHANNEL_OPEN
- for i := 0; i < 1000; i++ {
- o1.Id = ""
- o1.Name = "a" + model.NewId() + "b"
- if err := (<-store.Channel().Save(&o1)).Err; err != nil {
- t.Fatal("couldn't save item", err)
- }
- }
-
- o1.Id = ""
- o1.Name = "a" + model.NewId() + "b"
- if err := (<-store.Channel().Save(&o1)).Err; err == nil {
- t.Fatal("should be the limit")
- }
}
func TestChannelStoreSaveDirectChannel(t *testing.T) {