github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 05:57:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace redundant xml comments with inheritdoc. Make async changes to CloseSocket.

Browse source
This commit is contained in:
luke92brown 2022-05-09 22:00:30 -05:00 • committed by luke brown
parent 4b563f4d7e
commit 99df9c8fcd
6 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Emby.Dlna/PlayTo/PlayToController.cs
View file

@ -889,9 +889,9 @@ namespace Emby.Dlna.PlayTo
return Task.CompletedTask;
}
public void CloseAllWebSockets(CancellationToken cancellationToken)
/// <inheritdoc />
public async Task CloseAllWebSockets(CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
private class StreamParams

9
Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
View file

@ -231,13 +231,10 @@ namespace Emby.Server.Implementations.HttpServer
CancellationToken.None);
}
/// <summary>
/// Gracefully closes the socket.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
public void CloseSocket(CancellationToken cancellationToken)
/// <inheritdoc />
public async Task CloseSocket(CancellationToken cancellationToken)
{
_socket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "System Shutdown", cancellationToken);
await _socket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "System Shutdown", cancellationToken).ConfigureAwait(false);
}
/// <inheritdoc />

6
Emby.Server.Implementations/Session/SessionManager.cs
View file

@ -1363,7 +1363,7 @@ namespace Emby.Server.Implementations.Session
{
CheckDisposed();
CloseAllWebSockets(cancellationToken);
CloseAllWebSockets(cancellationToken).ConfigureAwait(false);
return SendMessageToSessions(Sessions, SessionMessageType.ServerShuttingDown, string.Empty, cancellationToken);
}
@ -1372,13 +1372,13 @@ namespace Emby.Server.Implementations.Session
/// Gracefully closes all web sockets in all sessions.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
private void CloseAllWebSockets(CancellationToken cancellationToken)
private async Task CloseAllWebSockets(CancellationToken cancellationToken)
{
foreach (var session in Sessions)
{
foreach (var sessionController in session.SessionControllers)
{
sessionController.CloseAllWebSockets(cancellationToken);
await sessionController.CloseAllWebSockets(cancellationToken).ConfigureAwait(false);
}
}
}

9
Emby.Server.Implementations/Session/WebSocketController.cs
View file

@ -88,15 +88,12 @@ namespace Emby.Server.Implementations.Session
cancellationToken);
}
/// <summary>
/// Gracefully closes all web sockets.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
public void CloseAllWebSockets(CancellationToken cancellationToken)
/// <inheritdoc />
public async Task CloseAllWebSockets(CancellationToken cancellationToken)
{
foreach (var socket in _sockets)
{
socket.CloseSocket(cancellationToken);
await socket.CloseSocket(cancellationToken).ConfigureAwait(false);
}
}

3
MediaBrowser.Controller/Net/IWebSocketConnection.cs
View file

@ -62,7 +62,8 @@ namespace MediaBrowser.Controller.Net
/// <summary>
/// Gracefully closes the socket.
/// </summary>
/// <returns>Task.</returns>
/// <param name="cancellationToken">The cancellation token.</param>
void CloseSocket(CancellationToken cancellationToken);
Task CloseSocket(CancellationToken cancellationToken);
}
}

3
MediaBrowser.Controller/Session/ISessionController.cs
View file

@ -38,6 +38,7 @@ namespace MediaBrowser.Controller.Session
/// Gracefully closes all web sockets.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
void CloseAllWebSockets(CancellationToken cancellationToken);
/// <returns>A task.</returns>
Task CloseAllWebSockets(CancellationToken cancellationToken);
}
}