Re-add shutdown/restart methods

3 files changed, 36 insertions, 24 deletions

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 86721ace6..e2d2719e5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -101,6 +101,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Prometheus.DotNetRuntime;
 using static MediaBrowser.Controller.Extensions.ConfigurationExtensions;
@@ -850,6 +851,24 @@ namespace Emby.Server.Implementations
             }
         }
 
+        /// <inheritdoc />
+        public void Restart()
+        {
+            ShouldRestart = true;
+            Shutdown();
+        }
+
+        /// <inheritdoc />
+        public void Shutdown()
+        {
+            Task.Run(async () =>
+            {
+                await Task.Delay(100).ConfigureAwait(false);
+                IsShuttingDown = true;
+                Resolve<IHostApplicationLifetime>().StopApplication();
+            });
+        }
+
         /// <summary>
         /// Gets the composable part assemblies.
         /// </summary>
diff --git a/Jellyfin.Api/Controllers/SystemController.cs b/Jellyfin.Api/Controllers/SystemController.cs
index 4cc0f0ced..42ac4a9b4 100644
--- a/Jellyfin.Api/Controllers/SystemController.cs
+++ b/Jellyfin.Api/Controllers/SystemController.cs
@@ -4,7 +4,6 @@ using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
 using System.Net.Mime;
-using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
 using MediaBrowser.Common.Configuration;
@@ -18,7 +17,6 @@ using MediaBrowser.Model.System;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Api.Controllers;
@@ -33,7 +31,6 @@ public class SystemController : BaseJellyfinApiController
     private readonly IFileSystem _fileSystem;
     private readonly INetworkManager _network;
     private readonly ILogger<SystemController> _logger;
-    private readonly IHostApplicationLifetime _hostApplicationLifetime;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SystemController"/> class.
@@ -43,21 +40,18 @@ public class SystemController : BaseJellyfinApiController
     /// <param name="fileSystem">Instance of <see cref="IFileSystem"/> interface.</param>
     /// <param name="network">Instance of <see cref="INetworkManager"/> interface.</param>
     /// <param name="logger">Instance of <see cref="ILogger{SystemController}"/> interface.</param>
-    /// <param name="hostApplicationLifetime">Instance of <see cref="IHostApplicationLifetime"/> interface.</param>
     public SystemController(
         IServerConfigurationManager serverConfigurationManager,
         IServerApplicationHost appHost,
         IFileSystem fileSystem,
         INetworkManager network,
-        ILogger<SystemController> logger,
-        IHostApplicationLifetime hostApplicationLifetime)
+        ILogger<SystemController> logger)
     {
         _appPaths = serverConfigurationManager.ApplicationPaths;
         _appHost = appHost;
         _fileSystem = fileSystem;
         _network = network;
         _logger = logger;
-        _hostApplicationLifetime = hostApplicationLifetime;
     }
 
     /// <summary>
@@ -112,13 +106,7 @@ public class SystemController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status403Forbidden)]
     public ActionResult RestartApplication()
     {
-        Task.Run(async () =>
-        {
-            await Task.Delay(100).ConfigureAwait(false);
-            _appHost.ShouldRestart = true;
-            _appHost.IsShuttingDown = true;
-            _hostApplicationLifetime.StopApplication();
-        });
+        _appHost.Restart();
         return NoContent();
     }
 
@@ -134,12 +122,7 @@ public class SystemController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status403Forbidden)]
     public ActionResult ShutdownApplication()
     {
-        Task.Run(async () =>
-        {
-            await Task.Delay(100).ConfigureAwait(false);
-            _appHost.IsShuttingDown = true;
-            _hostApplicationLifetime.StopApplication();
-        });
+        _appHost.Shutdown();
         return NoContent();
     }
 
diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs
index c1ea6e87c..5985d3dd8 100644
--- a/MediaBrowser.Common/IApplicationHost.cs
+++ b/MediaBrowser.Common/IApplicationHost.cs
@@ -41,15 +41,15 @@ namespace MediaBrowser.Common
         bool HasPendingRestart { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this instance is currently shutting down.
+        /// Gets a value indicating whether this instance is currently shutting down.
         /// </summary>
         /// <value><c>true</c> if this instance is shutting down; otherwise, <c>false</c>.</value>
-        bool IsShuttingDown { get; set; }
+        bool IsShuttingDown { get; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the application should restart.
+        /// Gets a value indicating whether the application should restart.
         /// </summary>
-        bool ShouldRestart { get; set; }
+        bool ShouldRestart { get; }
 
         /// <summary>
         /// Gets the application version.
@@ -92,6 +92,11 @@ namespace MediaBrowser.Common
         void NotifyPendingRestart();
 
         /// <summary>
+        /// Restarts this instance.
+        /// </summary>
+        void Restart();
+
+        /// <summary>
         /// Gets the exports.
         /// </summary>
         /// <typeparam name="T">The type.</typeparam>
@@ -123,6 +128,11 @@ namespace MediaBrowser.Common
         T Resolve<T>();
 
         /// <summary>
+        /// Shuts down.
+        /// </summary>
+        void Shutdown();
+
+        /// <summary>
         /// Initializes this instance.
         /// </summary>
         /// <param name="serviceCollection">Instance of the <see cref="IServiceCollection"/> interface.</param>