zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-11 23:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Fix major issue with SQLite transactions + aync code causing collisions

Browse source
This commit is contained in:
Bryan Ashby 2017-09-16 17:13:11 -06:00
parent 68247d87e8
commit 1e250f06d9
8 changed files with 116 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

57
core/message.js
View file

@ -321,8 +321,13 @@ Message.prototype.load = function(options, cb) {
);
};
Message.prototype.persistMetaValue = function(category, name, value, cb) {
const metaStmt = msgDb.prepare(
Message.prototype.persistMetaValue = function(category, name, value, transOrDb, cb) {
if(!_.isFunction(cb) && _.isFunction(transOrDb)) {
cb = transOrDb;
transOrDb = msgDb;
}
const metaStmt = transOrDb.prepare(
`INSERT INTO message_meta (message_id, meta_category, meta_name, meta_value)
VALUES (?, ?, ?, ?);`);
@ -341,18 +346,6 @@ Message.prototype.persistMetaValue = function(category, name, value, cb) {
});
};
Message.startTransaction = function(cb) {
msgDb.run('BEGIN;', err => {
cb(err);
});
};
Message.endTransaction = function(hadError, cb) {
msgDb.run(hadError ? 'ROLLBACK;' : 'COMMIT;', err => {
cb(err);
});
};
Message.prototype.persist = function(cb) {
if(!this.isValid()) {
@ -361,14 +354,12 @@ Message.prototype.persist = function(cb) {
const self = this;
async.series(
async.waterfall(
[
function beginTransaction(callback) {
Message.startTransaction(err => {
return callback(err);
});
return msgDb.beginTransaction(callback);
},
function storeMessage(callback) {
function storeMessage(trans, callback) {
// generate a UUID for this message if required (general case)
const msgTimestamp = moment();
if(!self.uuid) {
@ -379,7 +370,7 @@ Message.prototype.persist = function(cb) {
self.message);
}
msgDb.run(
trans.run(
`INSERT INTO message (area_tag, message_uuid, reply_to_message_id, to_user_name, from_user_name, subject, message, modified_timestamp)
VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
[ self.areaTag, self.uuid, self.replyToMsgId, self.toUserName, self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp) ],
@ -388,13 +379,13 @@ Message.prototype.persist = function(cb) {
self.messageId = this.lastID;
}
return callback(err);
return callback(err, trans);
}
);
},
function storeMeta(callback) {
function storeMeta(trans, callback) {
if(!self.meta) {
return callback(null);
return callback(null, trans);
}
/*
Example of self.meta:
@ -410,7 +401,7 @@ Message.prototype.persist = function(cb) {
*/
async.each(Object.keys(self.meta), (category, nextCat) => {
async.each(Object.keys(self.meta[category]), (name, nextName) => {
self.persistMetaValue(category, name, self.meta[category][name], err => {
self.persistMetaValue(category, name, self.meta[category][name], trans, err => {
nextName(err);
});
}, err => {
@ -418,18 +409,22 @@ Message.prototype.persist = function(cb) {
});
}, err => {
callback(err);
callback(err, trans);
});
},
function storeHashTags(callback) {
function storeHashTags(trans, callback) {
// :TODO: hash tag support
return callback(null);
return callback(null, trans);
}
],
err => {
Message.endTransaction(err, transErr => {
return cb(err ? err : transErr, self.messageId);
});
(err, trans) => {
if(trans) {
trans[err ? 'rollback' : 'commit'](transErr => {
return cb(err ? err : transErr, self.messageId);
});
} else {
return cb(err);
}
}
);
};