alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-15 23:02:18 +01:00
Code Issues Actions 7 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
Download Patch File Download Diff File Expand all files Collapse all files

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)
{
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)

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

@@ -45,7 +45,7 @@ namespace MediaBrowser.Server.Implementations.Session
{
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)
{
using (var wand = BuildThumbCollageWandWithText(paths, text, width, height))
using (var wand = BuildThumbCollageWand(paths, width, height))
{
return DynamicImageHelpers.GetStream(wand, _appPaths);
}