Merge pull request #920 from c24w/master

Clear process timeout timer when command completes

Author: njoyard

lib/processor.js

@@ -464,9 +464,8 @@ module.exports = function(proto) {
           }
 
           // Setup timeout if requested
-          var processTimer;
           if (self.options.timeout) {
-            processTimer = setTimeout(function() {
+            self.processTimer = setTimeout(function() {
               var msg = 'process ran into a timeout (' + self.options.timeout + 's)';
 
               emitEnd(new Error(msg), stdoutRing.get(), stderrRing.get());
@@ -533,6 +532,7 @@ module.exports = function(proto) {
         },
 
         function endCB(err, stdoutRing, stderrRing) {
+          clearTimeout(self.processTimer);
           delete self.ffmpegProc;
 
           if (err) {

test/processor.test.js

@@ -280,6 +280,18 @@ describe('Processor', function() {
           .saveToFile(testFile);
     });
 
+    it('should not keep node process running on completion', function(done) {
+      var script = `
+        var ffmpeg = require('.');
+        ffmpeg('${this.testfilebig}', { timeout: 60 })
+          .addOption('-t', 1)
+          .addOption('-f', 'null')
+          .saveToFile('/dev/null');
+      `;
+
+      exec(`node -e "${script}"`, { timeout: 1000 }, done);
+    });
+
     it('should kill the process with .kill', function(done) {
       var testFile = path.join(__dirname, 'assets', 'testProcessKill.avi');
       this.files.push(testFile);