diff --git a/.travis.yml b/.travis.yml index 77f0c855..9060d94f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "0.8" + - "0.10" install: - "bin/installDeps.sh" - "export GIT_HASH=$(cat .git/HEAD | head -c 7)" @@ -11,12 +11,13 @@ script: env: global: - secure: "OxZ2s724S96xu02746LUN+4lBckAe1BOICJjfA4jnFPNpiNU6XoMH52f+LgG\nZzAwu6xMTv+NsaLGp6Avm3cx4GZ+jIiHe4NB9XOgYPa0r0TBIi3ueWYPDyVv\nCniS/4qX68DoFNV4lh7zMBXn0IIPxT4Wppm3desBpjWDP/SdoRs=" - - SAUCE_USER=pita + - SAUCE_USER=etherpad jdk: - oraclejdk6 notifications: email: - petermartischka@googlemail.com + - contact@etherpad.org irc: channels: - - "irc.freenode.org#etherpad-lite-dev" \ No newline at end of file + - "irc.freenode.org#etherpad-lite-dev" diff --git a/src/node/utils/Abiword.js b/src/node/utils/Abiword.js index 92520343..498583c9 100644 --- a/src/node/utils/Abiword.js +++ b/src/node/utils/Abiword.js @@ -127,19 +127,21 @@ else doConvertTask = function(task, callback) { abiword.stdin.write("convert " + task.srcFile + " " + task.destFile + " " + task.type + "\n"); - //create a callback that calls the task callback and the caller callback stdoutCallback = function (err) { callback(); console.log("queue continue"); - task.callback(err); + try{ + task.callback(err); + }catch(e){ + console.error("Abiword File failed to convert", e); + } }; }; //Queue with the converts we have to do var queue = async.queue(doConvertTask, 1); - exports.convertFile = function(srcFile, destFile, type, callback) { queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback}); diff --git a/src/package.json b/src/package.json index e7c56549..f0324128 100644 --- a/src/package.json +++ b/src/package.json @@ -17,9 +17,9 @@ "resolve" : "0.2.x", "socket.io" : "0.9.x", "ueberDB" : "0.2.x", + "express" : "3.1.x", "async" : "0.1.x", - "express" : "3.1.0", - "connect" : "2.4.x", + "connect" : "2.7.x", "clean-css" : "0.3.2", "uglify-js" : "1.2.5", "formidable" : "1.0.9",