diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-01-06 16:13:10 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-01-06 16:13:10 -0500 |
| commit | 5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40 (patch) | |
| tree | b24590d93e46414e849ef4af7cefe54b8b7061d7 /api/context.go | |
| parent | 5855b5e4590889944e4a408f7185f84779fc701a (diff) | |
| parent | 214c6bc15ed1d0c9f94d0f0545d3f95241893cdc (diff) | |
| download | chat-5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40.tar.gz chat-5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40.tar.bz2 chat-5bcb9f1c50ed9c319d2a21f2ecb4816c51d18b40.zip | |
Merge pull request #1813 from mattermost/PLT-1558
PLT-1558 adding session length to config file
Diffstat (limited to 'api/context.go')
| -rw-r--r-- | api/context.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/api/context.go b/api/context.go index a6f9bc1e1..b39f03a7d 100644 --- a/api/context.go +++ b/api/context.go @@ -523,6 +523,13 @@ func GetSession(token string) *model.Session { l4g.Error("Invalid session token=" + token + ", err=" + sessionResult.Err.DetailedError) } else { session = sessionResult.Data.(*model.Session) + + if session.IsExpired() { + return nil + } else { + AddSessionToCache(session) + return session + } } } @@ -553,5 +560,5 @@ func FindMultiSessionForTeamId(r *http.Request, teamId string) (int64, *model.Se } func AddSessionToCache(session *model.Session) { - sessionCache.Add(session.Token, session) + sessionCache.AddWithExpiresInSecs(session.Token, session, int64(*utils.Cfg.ServiceSettings.SessionCacheInMinutes*60)) } |