libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

SessionStore: Avoid early DB.db dereference

Browse source 
Avoid dereferencing `DB.db` until it is used so that it is possible to
`require('SessionStore')` before calling `DB.init()`. (This is useful
when writing tests.)
This commit is contained in:
Richard Hansen 2020-09-21 17:07:56 -04:00 committed by John McLear
parent bee91a0bd1
commit 436cbb031d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node/db/SessionStore.js
View file

@ -7,8 +7,8 @@
* express-session, which can't actually use promises anyway.
*/
const DB = require('ep_etherpad-lite/node/db/DB');
const Store = require('ep_etherpad-lite/node_modules/express-session').Store;
const db = require('ep_etherpad-lite/node/db/DB').db;
const log4js = require('ep_etherpad-lite/node_modules/log4js');
const logger = log4js.getLogger('SessionStore');
@ -16,7 +16,7 @@ const logger = log4js.getLogger('SessionStore');
module.exports = class SessionStore extends Store {
get(sid, fn) {
logger.debug('GET ' + sid);
db.get('sessionstorage:' + sid, (err, sess) => {
DB.db.get('sessionstorage:' + sid, (err, sess) => {
if (sess) {
sess.cookie.expires = ('string' == typeof sess.cookie.expires
? new Date(sess.cookie.expires) : sess.cookie.expires);
@ -33,13 +33,13 @@ module.exports = class SessionStore extends Store {
set(sid, sess, fn) {
logger.debug('SET ' + sid);
db.set('sessionstorage:' + sid, sess);
DB.db.set('sessionstorage:' + sid, sess);
if (fn) process.nextTick(fn);
}
destroy(sid, fn) {
logger.debug('DESTROY ' + sid);
db.remove('sessionstorage:' + sid);
DB.db.remove('sessionstorage:' + sid);
if (fn) process.nextTick(fn);
}
};