diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-09-28 09:04:52 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-09-28 14:04:52 +0100 |
| commit | 15b361094a64fe024db6d3eaf9539143cee73ce4 (patch) | |
| tree | 9ff071eec6aa408b81484fb9e73340ed7ef3dbe3 /model | |
| parent | 8d662105d3049a5cd67a7bf42ab70d479d4348e2 (diff) | |
| download | chat-15b361094a64fe024db6d3eaf9539143cee73ce4.tar.gz chat-15b361094a64fe024db6d3eaf9539143cee73ce4.tar.bz2 chat-15b361094a64fe024db6d3eaf9539143cee73ce4.zip | |
PLT-7633 (E20) Add session idle timeout config setting (#7524)
* Add session idle timeout config setting
* Modify config setting name to SessionIdleTimeoutInMinutes
* Small re-org of if statement
* Merge with latest master
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index c55324ea7..8b6aad0e5 100644 --- a/model/config.go +++ b/model/config.go @@ -182,6 +182,7 @@ type ServiceSettings struct { SessionLengthMobileInDays *int SessionLengthSSOInDays *int SessionCacheInMinutes *int + SessionIdleTimeoutInMinutes *int WebsocketSecurePort *int WebsocketPort *int WebserverMode *string @@ -1155,6 +1156,11 @@ func (o *Config) SetDefaults() { *o.ServiceSettings.SessionCacheInMinutes = 10 } + if o.ServiceSettings.SessionIdleTimeoutInMinutes == nil { + o.ServiceSettings.SessionIdleTimeoutInMinutes = new(int) + *o.ServiceSettings.SessionIdleTimeoutInMinutes = 0 + } + if o.ServiceSettings.EnableCommands == nil { o.ServiceSettings.EnableCommands = new(bool) *o.ServiceSettings.EnableCommands = false |