lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that ffmpeg log target isn't disposed before writing to it

Browse Source
This commit is contained in:
Claus Vium 2019-02-24 21:24:57 +01:00
parent 4a3e42e779
commit 96b3d37caf
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Controller/MediaEncoding/JobLogger.cs
View File

@ -24,7 +24,8 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
using (var reader = new StreamReader(source)) 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); 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) catch (Exception ex)
{ {
_logger.LogError(ex, "Error reading ffmpeg log"); _logger.LogError(ex, "Error reading ffmpeg log");