upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

MM-41211: Allows rollback without destroying previous config setting. (#20137)

Browse source 
* MM-41211: Allows rollback without destroying previous config setting.

* MM-41211: Revert to original logic for unused config settings.

* MM-41211: Moves days defaults before hours defaults.

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Martin Kraft 2022-05-05 10:41:18 -04:00 committed by GitHub
parent 2c5f816e02
commit cd487c812c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
model/config.go
View file

@ -599,6 +599,14 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
s.ExtendSessionLengthWithActivity = NewBool(!isUpdate)
}
if s.SessionLengthWebInDays == nil {
if isUpdate {
s.SessionLengthWebInDays = NewInt(180)
} else {
s.SessionLengthWebInDays = NewInt(30)
}
}
if s.SessionLengthWebInHours == nil {
var webTTLDays int
if s.SessionLengthWebInDays == nil {
@ -612,7 +620,14 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
}
s.SessionLengthWebInHours = NewInt(webTTLDays * 24)
}
s.SessionLengthWebInDays = NewInt(-1)
if s.SessionLengthMobileInDays == nil {
if isUpdate {
s.SessionLengthMobileInDays = NewInt(180)
} else {
s.SessionLengthMobileInDays = NewInt(30)
}
}
if s.SessionLengthMobileInHours == nil {
var mobileTTLDays int
@ -627,7 +642,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
}
s.SessionLengthMobileInHours = NewInt(mobileTTLDays * 24)
}
s.SessionLengthMobileInDays = NewInt(-1)
if s.SessionLengthSSOInDays == nil {
s.SessionLengthSSOInDays = NewInt(30)
}
if s.SessionLengthSSOInHours == nil {
var ssoTTLDays int
@ -638,7 +656,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
}
s.SessionLengthSSOInHours = NewInt(ssoTTLDays * 24)
}
s.SessionLengthSSOInDays = NewInt(-1)
if s.SessionCacheInMinutes == nil {
s.SessionCacheInMinutes = NewInt(10)