Update User Limits for unlicensed servers (#30134)
* Update user soft and hard limits * Fix testt * Fix test
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f6c4bdf365
Коммит
7efdcda20a
@@ -12,8 +12,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
maxUsersLimit = 5_000
|
maxUsersLimit = 2_500
|
||||||
maxUsersHardLimit = 11_000
|
maxUsersHardLimit = 5_000
|
||||||
)
|
)
|
||||||
|
|
||||||
func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
|
func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ func TestGetServerLimits(t *testing.T) {
|
|||||||
|
|
||||||
// InitBasic creates 3 users by default
|
// InitBasic creates 3 users by default
|
||||||
require.Equal(t, int64(3), serverLimits.ActiveUserCount)
|
require.Equal(t, int64(3), serverLimits.ActiveUserCount)
|
||||||
require.Equal(t, int64(5000), serverLimits.MaxUsersLimit)
|
require.Equal(t, int64(2500), serverLimits.MaxUsersLimit)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("user count should increase on creating new user and decrease on permanently deleting", func(t *testing.T) {
|
t.Run("user count should increase on creating new user and decrease on permanently deleting", func(t *testing.T) {
|
||||||
|
|||||||
@@ -2306,7 +2306,7 @@ func TestCreateUserOrGuest(t *testing.T) {
|
|||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|
||||||
id := NewTestId()
|
id := NewTestId()
|
||||||
userCreationMocks(t, th, id, 11000)
|
userCreationMocks(t, th, id, 5000)
|
||||||
|
|
||||||
user := &model.User{
|
user := &model.User{
|
||||||
Email: "TestCreateUserOrGuest@example.com",
|
Email: "TestCreateUserOrGuest@example.com",
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ describe('getServerLimits', () => {
|
|||||||
test('should return data if user is admin', async () => {
|
test('should return data if user is admin', async () => {
|
||||||
const userLimits: ServerLimits = {
|
const userLimits: ServerLimits = {
|
||||||
activeUserCount: 600,
|
activeUserCount: 600,
|
||||||
maxUsersLimit: 5_000,
|
maxUsersLimit: 2_500,
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user