Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-25 03:31:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't set and read from topic hash in parallel (#6831)

Browse Source 
this was causing a test to fail, although very rarely
This commit is contained in:
Barış Soner Uşaklı
2018-10-13 01:06:07 -04:00
committed by GitHub
parent 28f2144933
commit a0f5461860
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/topics/recent.js
View File

@@ -250,31 +250,27 @@ module.exports = function (Topics) {
};
Topics.updateLastPostTime = function (tid, lastposttime, callback) {
async.parallel([
function (next) {
async.waterfall([
function (next) {
Topics.getTopicFields(tid, ['cid', 'deleted', 'pinned'], next);
},
function (topicData, next) {
var tasks = [
async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids:lastposttime', lastposttime, tid),
];
if (parseInt(topicData.deleted, 10) !== 1) {
tasks.push(async.apply(Topics.updateRecent, tid, lastposttime));
}
if (parseInt(topicData.pinned, 10) !== 1) {
tasks.push(async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids', lastposttime, tid));
}
async.series(tasks, next);
},
], next);
},
async.waterfall([
function (next) {
Topics.setTopicField(tid, 'lastposttime', lastposttime, next);
},
function (next) {
Topics.getTopicFields(tid, ['cid', 'deleted', 'pinned'], next);
},
function (topicData, next) {
var tasks = [
async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids:lastposttime', lastposttime, tid),
];
if (parseInt(topicData.deleted, 10) !== 1) {
tasks.push(async.apply(Topics.updateRecent, tid, lastposttime));
}
if (parseInt(topicData.pinned, 10) !== 1) {
tasks.push(async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids', lastposttime, tid));
}
async.series(tasks, next);
},
], function (err) {
callback(err);
});