Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 19:21:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
barisusakli
2017-04-16 14:48:00 -04:00
parent c3ac7c31b1 65a65b19c0
commit 38e16ca8f6
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/mongo.js
View File

@@ -116,9 +116,7 @@
var meta = require('../meta');
var sessionStore;
var ttlDays = 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlSeconds = (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600; // Default to 14 days in seconds
var ttl = meta.getSessionTTLSeconds();
if (nconf.get('redis')) {
sessionStore = require('connect-redis')(session);

6
src/database/redis.js
View File

@@ -60,13 +60,9 @@
var meta = require('../meta');
var sessionStore = require('connect-redis')(session);
var ttlDays = 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlSeconds = (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600; // Default to 14 days
module.sessionStore = new sessionStore({
client: module.client,
ttl: ttl,
ttl: meta.getSessionTTLSeconds(),
});
if (typeof callback === 'function') {