alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-17 15:53:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix some more issues with disposing Process instances

Browse Source
This commit is contained in:
Mark Monteiro
2020-03-27 01:53:08 +01:00
parent d705931e81
commit 1f5caa46c5
2 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@@ -435,39 +435,42 @@ namespace MediaBrowser.MediaEncoding.Subtitles
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
};
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
process.Exited += (sender, args) => ((Process)sender).Dispose();
_logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
int exitCode;
try
using (var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true })
{
process.Start();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error starting ffmpeg");
_logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
throw;
}
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
if (!ranToCompletion)
{
try
{
_logger.LogInformation("Killing ffmpeg subtitle conversion process");
process.Kill();
process.Start();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error killing subtitle conversion process");
}
}
_logger.LogError(ex, "Error starting ffmpeg");
var exitCode = ranToCompletion ? process.ExitCode : -1;
throw;
}
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
if (!ranToCompletion)
{
try
{
_logger.LogInformation("Killing ffmpeg subtitle conversion process");
process.Kill();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error killing subtitle conversion process");
}
}
exitCode = ranToCompletion ? process.ExitCode : -1;
}
var failed = false;
@@ -583,39 +586,42 @@ namespace MediaBrowser.MediaEncoding.Subtitles
WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false
};
var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true };
process.Exited += (sender, args) => ((Process)sender).Dispose();
_logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);
int exitCode;
try
using (var process = new Process { StartInfo = processStartInfo, EnableRaisingEvents = true })
{
process.Start();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error starting ffmpeg");
_logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);
throw;
}
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
if (!ranToCompletion)
{
try
{
_logger.LogWarning("Killing ffmpeg subtitle extraction process");
process.Kill();
process.Start();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error killing subtitle extraction process");
}
}
_logger.LogError(ex, "Error starting ffmpeg");
var exitCode = ranToCompletion ? process.ExitCode : -1;
throw;
}
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
if (!ranToCompletion)
{
try
{
_logger.LogWarning("Killing ffmpeg subtitle extraction process");
process.Kill();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error killing subtitle extraction process");
}
}
exitCode = ranToCompletion ? process.ExitCode : -1;
}
var failed = false;