alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-05 09:46:17 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

consolidate web socket onto one port

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-18 21:28:40 -04:00
parent ea559a6e27
commit bc657237aa
20 changed files with 1900 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@@ -72,7 +72,6 @@ using MediaBrowser.Server.Implementations.ServerManager;
using MediaBrowser.Server.Implementations.Session;
using MediaBrowser.Server.Implementations.Sync;
using MediaBrowser.Server.Implementations.Themes;
using MediaBrowser.Server.Implementations.WebSocket;
using MediaBrowser.ServerApplication.EntryPoints;
using MediaBrowser.ServerApplication.FFMpeg;
using MediaBrowser.ServerApplication.IO;
@@ -517,8 +516,6 @@ namespace MediaBrowser.ServerApplication
LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer);
RegisterSingleInstance(LocalizationManager);
RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger));
RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer());
UserDataManager = new UserDataManager(LogManager);
@@ -868,8 +865,6 @@ namespace MediaBrowser.ServerApplication
throw;
}
}
ServerManager.StartWebSocketServer();
}
/// <summary>
@@ -885,11 +880,6 @@ namespace MediaBrowser.ServerApplication
{
NotifyPendingRestart();
}
else if (!ServerManager.SupportsNativeWebSocket && ServerManager.WebSocketPortNumber != ServerConfigurationManager.Configuration.LegacyWebSocketPortNumber)
{
NotifyPendingRestart();
}
}
/// <summary>
@@ -1022,7 +1012,7 @@ namespace MediaBrowser.ServerApplication
Version = ApplicationVersion.ToString(),
IsNetworkDeployed = CanSelfUpdate,
WebSocketPortNumber = ServerManager.WebSocketPortNumber,
SupportsNativeWebSocket = ServerManager.SupportsNativeWebSocket,
SupportsNativeWebSocket = true,
FailedPluginAssemblies = FailedAssemblies.ToList(),
InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToList(),
CompletedInstallations = InstallationManager.CompletedInstallations.ToList(),