Handle upload errors

bancek · Nov 28, 2012 · 76b42dc · 76b42dc
1 parent 5fb6cd7
commit 76b42dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/jsftp.js b/lib/jsftp.js
@@ -598,8 +598,14 @@ Ftp.getPasvPort = function(text) {
                     called = true;
                     callback(err, socket);
                 } else {
-                    if (!Ftp.isMark(res.code) && doneCallback) {
-                        doneCallback(res)
+                    if (doneCallback) {
+                        if (err) {
+                            doneCallback(err)
+                        } else {
+                            if (!Ftp.isMark(res.code)) {
+                                doneCallback(err, res)
+                            }
+                        }
                     }
                 }
             };

diff --git a/test/jsftp_test.js b/test/jsftp_test.js
@@ -313,7 +313,7 @@ describe("jsftp test suite", function() {
 
                 socket.end();
             });
-        }, function(res) {
+        }, function(err, res) {
             assert.equal(res.code, 226);
 
             ftp.raw.dele(remotePath, function(err, data) {
@@ -330,7 +330,7 @@ describe("jsftp test suite", function() {
             assert.ok(err, err);
             assert.equal(err.code, 550);
             next();
-        }, function(res) {
+        }, function(err, res) {
             assert.ok(false);
         });
     });