Fixed open file descriptor bug (#181) when using output option.

tomas · Aug 8, 2016 · d31ff62 · d31ff62
1 parent 9cfde90
commit d31ff62
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/lib/needle.js b/lib/needle.js
@@ -519,6 +519,10 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
       var file = fs.createWriteStream(config.output);
       file.on('error', had_error);
 
+      out.on('end', function() {
+        if (file.writable) file.end();
+      });
+
       out.on('readable', function() {
         var chunk;
         while (chunk = this.read()) {

diff --git a/test/output_spec.js b/test/output_spec.js
@@ -22,6 +22,12 @@ describe('with output option', function() {
     stream.on('end', cb);
   }
 
+  // this will only work in UNICES
+  function get_open_file_descriptors() {
+    var list = fs.readdirSync('/proc/self/fd');
+    return list.length;
+  }
+
   var send_request = send_request_cb;
 
   before(function(){
@@ -103,6 +109,17 @@ describe('with output option', function() {
         })
       })
 
+      it('closes the file descriptor', function(done) {
+        var open_descriptors = get_open_file_descriptors();
+        send_request(file + Math.random(), function(err, resp) {
+          setTimeout(function() {
+            var current_descriptors = get_open_file_descriptors();
+            open_descriptors.should.eql(current_descriptors);
+            done()
+          }, 10)
+        })
+      })
+
     })
 
     describe('for a JSON response', function() {
@@ -156,6 +173,17 @@ describe('with output option', function() {
         })
       })
 
+      it('closes the file descriptor', function(done) {
+        var open_descriptors = get_open_file_descriptors();
+        send_request(file + Math.random(), function(err, resp) {
+          setTimeout(function() {
+            var current_descriptors = get_open_file_descriptors();
+            open_descriptors.should.eql(current_descriptors);
+            done()
+          }, 10)
+        })
+      })
+
     })
 
     describe('for a binary file', function() {
@@ -213,6 +241,17 @@ describe('with output option', function() {
         })
       })
 
+      it('closes the file descriptor', function(done) {
+        var open_descriptors = get_open_file_descriptors();
+        send_request(file + Math.random(), function(err, resp) {
+          setTimeout(function() {
+            var current_descriptors = get_open_file_descriptors();
+            open_descriptors.should.eql(current_descriptors);
+            done()
+          }, 10)
+        })
+      })
+
     })
 
   })