A better fix for Automattic#191 error emissions.

thurmda · Jul 13, 2013 · ccdc5a8 · ccdc5a8
1 parent 1708bd0
commit ccdc5a8
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -395,10 +395,21 @@ Client.prototype.putFile = function(src, filename, headers, fn){
     }, headers);
 
     var stream = fs.createReadStream(src);
-    var req = self.putStream(stream, filename, headers, fn);
+
+    var fnCalled = false;
+    function wrappedFn(err, result) {
+      if (fnCalled) {
+        if (err) {
+          emitter.emit('error', err);
+        }
+      } else {
+        fnCalled = true;
+        fn(err, result);
+      }
+    }
+    var req = self.putStream(stream, filename, headers, wrappedFn);
 
     req.on('progress', emitter.emit.bind(emitter, 'progress'));
-    req.on('error', emitter.emit.bind(emitter, 'error'));
   });
 
   return emitter;