specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Minor fix

Browse source
This commit is contained in:
calzoneman 2015-07-30 22:12:52 -07:00
parent b0f65ded80
commit 9a5c71fddc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ffmpeg.js
View file

@ -158,7 +158,8 @@ exports.ffprobe = function ffprobe(filename, cb) {
var timer = setTimeout(function () { var timer = setTimeout(function () {
Logger.errlog.log("Possible runaway ffprobe process for file " + filename); Logger.errlog.log("Possible runaway ffprobe process for file " + filename);
fflog("Killing ffprobe for " + filename + " after " + (TIMEOUT/1000) + " seconds"); fflog("Killing ffprobe for " + filename + " after " + (TIMEOUT/1000) + " seconds");
childErr = new Error("File query exceeded time limit of 10 seconds"); childErr = new Error("File query exceeded time limit of " + (TIMEOUT/1000) +
" seconds");
child.kill("SIGKILL"); child.kill("SIGKILL");
}, TIMEOUT); }, TIMEOUT);
@ -172,7 +173,7 @@ exports.ffprobe = function ffprobe(filename, cb) {
child.stderr.on("data", function (data) { child.stderr.on("data", function (data) {
stderr += data; stderr += data;
if (stderr.match(/the tls connection was non-properly terminated/i)) { if (stderr.match(/the tls connection was non-properly terminated|http error 416/i)) {
fflog("Killing ffprobe for " + filename + " due to TLS error"); fflog("Killing ffprobe for " + filename + " due to TLS error");
childErr = new Error("Remote server closed connection unexpectedly"); childErr = new Error("Remote server closed connection unexpectedly");
child.kill("SIGKILL"); child.kill("SIGKILL");