aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
diff options
context:
space:
mode:
authorClaus Vium <clausvium@gmail.com>2019-02-24 21:24:57 +0100
committerClaus Vium <clausvium@gmail.com>2019-02-24 21:25:24 +0100
commit96b3d37caf269789015900bd7f6fa24f17652848 (patch)
tree1abce4af51c1c0cb9b0e73e9b5e7ce2b94c20638 /MediaBrowser.Controller/MediaEncoding/JobLogger.cs
parent4a3e42e7794bd8b337ded2d38ad12298be7e819e (diff)
Check that ffmpeg log target isn't disposed before writing to it
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/JobLogger.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/JobLogger.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
index b812a8ddc..5cd6fd27a 100644
--- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
+++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
@@ -24,7 +24,8 @@ namespace MediaBrowser.Controller.MediaEncoding
{
using (var reader = new StreamReader(source))
{
- while (!reader.EndOfStream)
+ // If ffmpeg process is closed, the state is disposed, so don't write to target in that case
+ while (!reader.EndOfStream && target.CanWrite)
{
var line = await reader.ReadLineAsync().ConfigureAwait(false);
@@ -37,11 +38,6 @@ namespace MediaBrowser.Controller.MediaEncoding
}
}
}
- catch (ObjectDisposedException)
- {
- //TODO Investigate and properly fix.
- // Don't spam the log. This doesn't seem to throw in windows, but sometimes under linux
- }
catch (Exception ex)
{
_logger.LogError(ex, "Error reading ffmpeg log");