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

add socket error message

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-24 21:34:34 -04:00
parent caebcf82c0
commit e62270df35
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -407,6 +407,11 @@ namespace MediaBrowser.Api
{ {
try try
{ {
if (job.TranscodingThrottler != null)
{
job.TranscodingThrottler.Stop();
}
Logger.Info("Killing ffmpeg process for {0}", job.Path); Logger.Info("Killing ffmpeg process for {0}", job.Path);
//process.Kill(); //process.Kill();
@ -578,6 +583,8 @@ namespace MediaBrowser.Api
public long? TranscodingPositionTicks { get; set; } public long? TranscodingPositionTicks { get; set; }
public long? DownloadPositionTicks { get; set; } public long? DownloadPositionTicks { get; set; }
public TranscodingThrottler TranscodingThrottler { get; set; }
public void DisposeKillTimer() public void DisposeKillTimer()
{ {
if (KillTimer != null) if (KillTimer != null)

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

@ -1123,7 +1123,7 @@ namespace MediaBrowser.Api.Playback
{ {
if (state.RunTimeTicks.Value >= TimeSpan.FromMinutes(5).Ticks && state.IsInputVideo) if (state.RunTimeTicks.Value >= TimeSpan.FromMinutes(5).Ticks && state.IsInputVideo)
{ {
state.TranscodingThrottler = new TranscodingThrottler(transcodingJob, Logger); transcodingJob.TranscodingThrottler = state.TranscodingThrottler = new TranscodingThrottler(transcodingJob, Logger);
state.TranscodingThrottler.Start(); state.TranscodingThrottler.Start();
} }
} }

6
MediaBrowser.Api/Playback/TranscodingThrottler.cs
View File

@ -139,6 +139,12 @@ namespace MediaBrowser.Api.Playback
return false; return false;
} }
public void Stop()
{
DisposeTimer();
UnpauseTranscoding();
}
public void Dispose() public void Dispose()
{ {
DisposeTimer(); DisposeTimer();

3
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
View File

@ -56,7 +56,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e) void socket_OnError(object sender, SocketHttpListener.ErrorEventArgs e)
{ {
EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger); _logger.Error("Error in SharpWebSocket: {0}", e.Message ?? string.Empty);
//EventHelper.FireEventIfNotNull(Closed, this, EventArgs.Empty, _logger);
} }
void socket_OnClose(object sender, SocketHttpListener.CloseEventArgs e) void socket_OnClose(object sender, SocketHttpListener.CloseEventArgs e)

2
MediaBrowser.Server.Implementations/Session/WebSocketController.cs
View File

@ -45,7 +45,7 @@ namespace MediaBrowser.Server.Implementations.Session
{ {
get get
{ {
return _isActive; return HasOpenSockets;
} }
} }

2
MediaBrowser.Server.Implementations/UserViews/StripCollageBuilder.cs
View File

@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
public Stream BuildThumbCollage(IEnumerable<string> paths, string text, int width, int height) public Stream BuildThumbCollage(IEnumerable<string> paths, string text, int width, int height)
{ {
using (var wand = BuildThumbCollageWandWithText(paths, text, width, height)) using (var wand = BuildThumbCollageWand(paths, width, height))
{ {
return DynamicImageHelpers.GetStream(wand, _appPaths); return DynamicImageHelpers.GetStream(wand, _appPaths);
} }