self-hosted/jellyfin
self-hosted/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin synced 2024-07-05 17:08:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixed disposable not being called (#10613)

Browse Source 
* Fixed disposable not being called

* PulledUp usage of IAsyncDisposable for sessioninfo

Co-authored-by: Patrick Barron <barronpm@gmail.com>
This commit is contained in:
JPVenson 2024-01-14 16:50:09 +01:00 committed by GitHub
parent d40224128c
commit 3ce16713dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Emby.Server.Implementations/Session/SessionManager.cs
View File

@ -189,7 +189,7 @@ namespace Emby.Server.Implementations.Session
_logger);
}
private void OnSessionEnded(SessionInfo info)
private async ValueTask OnSessionEnded(SessionInfo info)
{
EventHelper.QueueEventIfNotNull(
SessionEnded,
@ -202,7 +202,7 @@ namespace Emby.Server.Implementations.Session
_eventManager.Publish(new SessionEndedEventArgs(info));
info.Dispose();
await info.DisposeAsync().ConfigureAwait(false);
}
/// <inheritdoc />
@ -301,12 +301,12 @@ namespace Emby.Server.Implementations.Session
await _mediaSourceManager.CloseLiveStream(session.PlayState.LiveStreamId).ConfigureAwait(false);
}
OnSessionEnded(session);
await OnSessionEnded(session).ConfigureAwait(false);
}
}
/// <inheritdoc />
public void ReportSessionEnded(string sessionId)
public async ValueTask ReportSessionEnded(string sessionId)
{
CheckDisposed();
var session = GetSession(sessionId, false);
@ -317,7 +317,7 @@ namespace Emby.Server.Implementations.Session
_activeConnections.TryRemove(key, out _);
OnSessionEnded(session);
await OnSessionEnded(session).ConfigureAwait(false);
}
}
@ -1590,7 +1590,7 @@ namespace Emby.Server.Implementations.Session
{
try
{
ReportSessionEnded(session.Id);
await ReportSessionEnded(session.Id).ConfigureAwait(false);
}
catch (Exception ex)
{

3
MediaBrowser.Controller/Session/ISessionManager.cs
View File

@ -111,7 +111,8 @@ namespace MediaBrowser.Controller.Session
/// Reports the session ended.
/// </summary>
/// <param name="sessionId">The session identifier.</param>
void ReportSessionEnded(string sessionId);
/// <returns>Task.</returns>
ValueTask ReportSessionEnded(string sessionId);
/// <summary>
/// Sends the general command.

30
MediaBrowser.Controller/Session/SessionInfo.cs
View File

@ -19,7 +19,7 @@ namespace MediaBrowser.Controller.Session
/// <summary>
/// Class SessionInfo.
/// </summary>
public sealed class SessionInfo : IAsyncDisposable, IDisposable
public sealed class SessionInfo : IAsyncDisposable
{
// 1 second
private const long ProgressIncrement = 10000000;
@ -374,8 +374,7 @@ namespace MediaBrowser.Controller.Session
}
}
/// <inheritdoc />
public void Dispose()
public async ValueTask DisposeAsync()
{
_disposed = true;
@ -386,30 +385,17 @@ namespace MediaBrowser.Controller.Session
foreach (var controller in controllers)
{
if (controller is IDisposable disposable)
if (controller is IAsyncDisposable disposableAsync)
{
_logger.LogDebug("Disposing session controller asynchronously {TypeName}", disposableAsync.GetType().Name);
await disposableAsync.DisposeAsync().ConfigureAwait(false);
}
else if (controller is IDisposable disposable)
{
_logger.LogDebug("Disposing session controller synchronously {TypeName}", disposable.GetType().Name);
disposable.Dispose();
}
}
}
public async ValueTask DisposeAsync()
{
_disposed = true;
StopAutomaticProgress();
var controllers = SessionControllers.ToList();
foreach (var controller in controllers)
{
if (controller is IAsyncDisposable disposableAsync)
{
_logger.LogDebug("Disposing session controller asynchronously {TypeName}", disposableAsync.GetType().Name);
await disposableAsync.DisposeAsync().ConfigureAwait(false);
}
}
}
}
}