Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Vasily 2019-10-16 16:13:59 +03:00
parent adccc18298
commit 6b6fede2e0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -543,6 +543,7 @@ namespace Emby.Server.Implementations.HttpServer
{ {
_logger.LogDebug("Sending HTTP Response 500 in response to {Url}", urlToLog); _logger.LogDebug("Sending HTTP Response 500 in response to {Url}", urlToLog);
} }
stopWatch.Stop(); stopWatch.Stop();
var elapsed = stopWatch.Elapsed; var elapsed = stopWatch.Elapsed;
if (elapsed.TotalMilliseconds > 500) if (elapsed.TotalMilliseconds > 500)

8
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -296,13 +296,13 @@ namespace MediaBrowser.Api.Playback
_ = new JobLogger(Logger).StartStreamingLog(state, process.StandardError.BaseStream, logStream); _ = new JobLogger(Logger).StartStreamingLog(state, process.StandardError.BaseStream, logStream);
// Wait for the file to exist before proceeeding // Wait for the file to exist before proceeeding
var waitFor = state.WaitForPath ?? outputPath; var ffmpegTargetFile = state.WaitForPath ?? outputPath;
Logger.LogDebug("Waiting for the creation of {0}", waitFor); Logger.LogDebug("Waiting for the creation of {0}", ffmpegTargetFile);
while (!File.Exists(waitFor) && !transcodingJob.HasExited) while (!File.Exists(ffmpegTargetFile) && !transcodingJob.HasExited)
{ {
await Task.Delay(100, cancellationTokenSource.Token).ConfigureAwait(false); await Task.Delay(100, cancellationTokenSource.Token).ConfigureAwait(false);
} }
Logger.LogDebug("File {0} created or transcoding has finished", waitFor); Logger.LogDebug("File {0} created or transcoding has finished", ffmpegTargetFile);
if (state.IsInputVideo && transcodingJob.Type == TranscodingJobType.Progressive && !transcodingJob.HasExited) if (state.IsInputVideo && transcodingJob.Type == TranscodingJobType.Progressive && !transcodingJob.HasExited)
{ {