fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1743 from ether/dont-crash-on-export-abiword 

catch error on export
This commit is contained in:
John McLear 2013-04-15 15:32:14 -07:00
parent fac4058e83 f987299a5d
commit c19b7b8f55
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/node/utils/Abiword.js
View File

@ -127,19 +127,21 @@ else
doConvertTask = function(task, callback) doConvertTask = function(task, callback)
{ {
abiword.stdin.write("convert " + task.srcFile + " " + task.destFile + " " + task.type + "\n"); abiword.stdin.write("convert " + task.srcFile + " " + task.destFile + " " + task.type + "\n");
//create a callback that calls the task callback and the caller callback //create a callback that calls the task callback and the caller callback
stdoutCallback = function (err) stdoutCallback = function (err)
{ {
callback(); callback();
console.log("queue continue"); console.log("queue continue");
try{
task.callback(err); task.callback(err);
}catch(e){
console.error("Abiword File failed to convert", e);
}
}; };
}; };
//Queue with the converts we have to do //Queue with the converts we have to do
var queue = async.queue(doConvertTask, 1); var queue = async.queue(doConvertTask, 1);
exports.convertFile = function(srcFile, destFile, type, callback) exports.convertFile = function(srcFile, destFile, type, callback)
{ {
queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback}); queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback});