libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

print revision numbers - not changesets - in warn-log

Browse source
This commit is contained in:
webzwo0i 2015-03-02 11:14:24 +01:00
parent 683c9dfb7c
commit 0f82cd8711
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/node/handler/PadMessageHandler.js
View file

@ -1635,7 +1635,8 @@ function composePadChangesets(padId, startNum, endNum, callback)
changeset = Changeset.compose(changeset, cs, pool);
}
} catch(e){
console.warn("failed to compose cs in pad:",padId);
// r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3
console.warn("failed to compose cs in pad:",padId," startrev:",startNum," current rev:",r);
return callback(e);
}

2
src/static/js/Changeset.js
View file

@ -1318,7 +1318,7 @@ exports.compose = function (cs1, cs2, pool) {
var unpacked2 = exports.unpack(cs2);
var len1 = unpacked1.oldLen;
var len2 = unpacked1.newLen;
exports.assert(len2 == unpacked2.oldLen, "mismatched composition of two changesets - cs1:",cs1," and cs2:",cs2);
exports.assert(len2 == unpacked2.oldLen, "mismatched composition of two changesets");
var len3 = unpacked2.newLen;
var bankIter1 = exports.stringIterator(unpacked1.charBank);
var bankIter2 = exports.stringIterator(unpacked2.charBank);