aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rabert <ar@nullsum.net>2019-09-29 19:06:14 -0400
committerAndrew Rabert <ar@nullsum.net>2019-09-29 19:19:53 -0400
commitfd1bdad0e22715cb589d3bbee9ed9805989ac544 (patch)
tree728728b3155d55fe42a4c2f9780d8c2f019730ed
parent749023bf02c9797ce2e0b5142fb2ddd27e682df0 (diff)
Ignore exception when attempting to kill ffmpeg that has exited
A race condition where this code attempts to kill an already exited ffmpeg process is possible. This results in unnecessary error logging. This change replaces the generic exception handling with the above mentioned exception. No log output is produced.
-rw-r--r--MediaBrowser.Api/ApiEntryPoint.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index a223a4fe3..7dca7e814 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -610,9 +610,8 @@ namespace MediaBrowser.Api
process.Kill();
}
}
- catch (Exception ex)
+ catch (InvalidOperationException)
{
- Logger.LogError(ex, "Error killing transcoding job for {Path}", job.Path);
}
}
}