mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
allow service to restart itself
This commit is contained in:
parent
df29ed5a6f
commit
207fbbbcc3
4 changed files with 124 additions and 74 deletions
|
@ -2,10 +2,9 @@
|
||||||
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
|
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
|
||||||
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mono\Program.cs">
|
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mono\Program.cs">
|
||||||
<Files>
|
<Files>
|
||||||
<File FileName="MediaBrowser.Server.Mono\Program.cs" Line="3" Column="40" />
|
<File FileName="MediaBrowser.Server.Mono\app.config" Line="10" Column="44" />
|
||||||
<File FileName="MediaBrowser.Server.Mono\Native\NativeApp.cs" Line="1" Column="1" />
|
<File FileName="MediaBrowser.ServerApplication\ApplicationHost.cs" Line="1" Column="1" />
|
||||||
<File FileName="d:\Development\MediaBrowser\MediaBrowser.Common.Implementations\Logging\NLogger.cs" Line="1" Column="1" />
|
<File FileName="MediaBrowser.Server.Mono\Program.cs" Line="63" Column="5" />
|
||||||
<File FileName="d:\Development\MediaBrowser\MediaBrowser.Common.Implementations\BaseApplicationHost.cs" Line="1" Column="1" />
|
|
||||||
</Files>
|
</Files>
|
||||||
</MonoDevelop.Ide.Workbench>
|
</MonoDevelop.Ide.Workbench>
|
||||||
<MonoDevelop.Ide.DebuggingService.Breakpoints>
|
<MonoDevelop.Ide.DebuggingService.Breakpoints>
|
||||||
|
|
|
@ -81,7 +81,7 @@ namespace MediaBrowser.Server.Mono
|
||||||
|
|
||||||
private static ServerApplicationPaths CreateApplicationPaths()
|
private static ServerApplicationPaths CreateApplicationPaths()
|
||||||
{
|
{
|
||||||
return new ServerApplicationPaths("D:\\MonoTest");
|
return new ServerApplicationPaths();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager)
|
private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager)
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<targets async="true"></targets>
|
<targets async="true"></targets>
|
||||||
</nlog>
|
</nlog>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
|
<add key="DebugProgramDataPath" value="ProgramData-Server" />
|
||||||
<add key="ReleaseProgramDataPath" value="%ApplicationData%" />
|
<add key="ReleaseProgramDataPath" value="%ApplicationData%" />
|
||||||
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
|
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
|
||||||
</appSettings>
|
</appSettings>
|
||||||
|
|
|
@ -5,31 +5,28 @@ using MediaBrowser.Model.Logging;
|
||||||
using MediaBrowser.Server.Implementations;
|
using MediaBrowser.Server.Implementations;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
using System;
|
using System;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Configuration.Install;
|
using System.Configuration.Install;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.ServiceProcess;
|
using System.ServiceProcess;
|
||||||
using System.Threading;
|
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
|
||||||
namespace MediaBrowser.ServerApplication
|
namespace MediaBrowser.ServerApplication
|
||||||
{
|
{
|
||||||
public class MainStartup
|
public class MainStartup
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// The single instance mutex
|
|
||||||
/// </summary>
|
|
||||||
private static Mutex _singleInstanceMutex;
|
|
||||||
|
|
||||||
private static ApplicationHost _appHost;
|
private static ApplicationHost _appHost;
|
||||||
|
|
||||||
private static App _app;
|
private static App _app;
|
||||||
|
|
||||||
private static BackgroundService _backgroundService;
|
|
||||||
|
|
||||||
private static ILogger _logger;
|
private static ILogger _logger;
|
||||||
|
|
||||||
|
private static bool _isRestarting = false;
|
||||||
|
|
||||||
|
private static bool _isRunningAsService = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Defines the entry point of the application.
|
/// Defines the entry point of the application.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -37,9 +34,9 @@ namespace MediaBrowser.ServerApplication
|
||||||
public static void Main()
|
public static void Main()
|
||||||
{
|
{
|
||||||
var startFlag = Environment.GetCommandLineArgs().ElementAtOrDefault(1);
|
var startFlag = Environment.GetCommandLineArgs().ElementAtOrDefault(1);
|
||||||
var runService = string.Equals(startFlag, "-service", StringComparison.OrdinalIgnoreCase);
|
_isRunningAsService = string.Equals(startFlag, "-service", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
var appPaths = CreateApplicationPaths(runService);
|
var appPaths = CreateApplicationPaths(_isRunningAsService);
|
||||||
|
|
||||||
var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");
|
var logManager = new NlogManager(appPaths.LogDirectoryPath, "server");
|
||||||
logManager.ReloadLogger(LogSeverity.Info);
|
logManager.ReloadLogger(LogSeverity.Info);
|
||||||
|
@ -82,15 +79,12 @@ namespace MediaBrowser.ServerApplication
|
||||||
|
|
||||||
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
||||||
|
|
||||||
bool createdNew;
|
RunServiceInstallationIfNeeded();
|
||||||
|
|
||||||
var runningPath = Process.GetCurrentProcess().MainModule.FileName.Replace(Path.DirectorySeparatorChar.ToString(), string.Empty);
|
var currentProcess = Process.GetCurrentProcess();
|
||||||
|
|
||||||
_singleInstanceMutex = new Mutex(true, @"Local\" + runningPath, out createdNew);
|
if (IsAlreadyRunning(currentProcess))
|
||||||
|
|
||||||
if (!createdNew)
|
|
||||||
{
|
{
|
||||||
_singleInstanceMutex = null;
|
|
||||||
logger.Info("Shutting down because another instance of Media Browser Server is already running.");
|
logger.Info("Shutting down because another instance of Media Browser Server is already running.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -103,18 +97,49 @@ namespace MediaBrowser.ServerApplication
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RunApplication(appPaths, logManager, runService);
|
RunApplication(appPaths, logManager, _isRunningAsService);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
logger.Info("Shutting down");
|
OnServiceShutdown();
|
||||||
|
|
||||||
ReleaseMutex(logger);
|
|
||||||
|
|
||||||
_appHost.Dispose();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether [is already running] [the specified current process].
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="currentProcess">The current process.</param>
|
||||||
|
/// <returns><c>true</c> if [is already running] [the specified current process]; otherwise, <c>false</c>.</returns>
|
||||||
|
private static bool IsAlreadyRunning(Process currentProcess)
|
||||||
|
{
|
||||||
|
var runningPath = Process.GetCurrentProcess().MainModule.FileName;
|
||||||
|
|
||||||
|
var duplicate = Process.GetProcesses().FirstOrDefault(i =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return string.Equals(runningPath, i.MainModule.FileName) && currentProcess.Id != i.Id;
|
||||||
|
}
|
||||||
|
catch (Win32Exception)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (duplicate != null)
|
||||||
|
{
|
||||||
|
_logger.Info("Found a duplicate process. Giving it time to exit.");
|
||||||
|
|
||||||
|
if (!duplicate.WaitForExit(5000))
|
||||||
|
{
|
||||||
|
_logger.Info("The duplicate process did not exit.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates the application paths.
|
/// Creates the application paths.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -159,8 +184,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
{
|
{
|
||||||
SystemEvents.SessionEnding += SystemEvents_SessionEnding;
|
SystemEvents.SessionEnding += SystemEvents_SessionEnding;
|
||||||
|
|
||||||
var commandLineArgs = Environment.GetCommandLineArgs();
|
|
||||||
|
|
||||||
_appHost = new ApplicationHost(appPaths, logManager);
|
_appHost = new ApplicationHost(appPaths, logManager);
|
||||||
|
|
||||||
_app = new App(_appHost, _appHost.LogManager.GetLogger("App"), runService);
|
_app = new App(_appHost, _appHost.LogManager.GetLogger("App"), runService);
|
||||||
|
@ -178,20 +201,11 @@ namespace MediaBrowser.ServerApplication
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static void StartService(ILogManager logManager)
|
private static void StartService(ILogManager logManager)
|
||||||
{
|
{
|
||||||
var ctl = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == BackgroundService.Name);
|
|
||||||
|
|
||||||
if (ctl == null)
|
|
||||||
{
|
|
||||||
RunServiceInstallation();
|
|
||||||
}
|
|
||||||
|
|
||||||
var service = new BackgroundService(logManager.GetLogger("Service"));
|
var service = new BackgroundService(logManager.GetLogger("Service"));
|
||||||
|
|
||||||
service.Disposed += service_Disposed;
|
service.Disposed += service_Disposed;
|
||||||
|
|
||||||
ServiceBase.Run(service);
|
ServiceBase.Run(service);
|
||||||
|
|
||||||
_backgroundService = service;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -199,9 +213,27 @@ namespace MediaBrowser.ServerApplication
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="sender">The source of the event.</param>
|
/// <param name="sender">The source of the event.</param>
|
||||||
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
|
||||||
static async void service_Disposed(object sender, EventArgs e)
|
static void service_Disposed(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
await _appHost.Shutdown();
|
OnServiceShutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void OnServiceShutdown()
|
||||||
|
{
|
||||||
|
_logger.Info("Shutting down");
|
||||||
|
|
||||||
|
_appHost.Dispose();
|
||||||
|
|
||||||
|
if (_isRestarting)
|
||||||
|
{
|
||||||
|
using (var process = Process.Start("cmd", "/c net start " + BackgroundService.Name))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.Info("New service process started");
|
||||||
|
}
|
||||||
|
|
||||||
|
_app.Dispatcher.Invoke(_app.Shutdown);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -242,6 +274,16 @@ namespace MediaBrowser.ServerApplication
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void RunServiceInstallationIfNeeded()
|
||||||
|
{
|
||||||
|
var ctl = ServiceController.GetServices().FirstOrDefault(s => s.ServiceName == BackgroundService.Name);
|
||||||
|
|
||||||
|
if (ctl == null)
|
||||||
|
{
|
||||||
|
RunServiceInstallation();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Runs the service installation.
|
/// Runs the service installation.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -299,7 +341,7 @@ namespace MediaBrowser.ServerApplication
|
||||||
/// <param name="e">The <see cref="SessionEndingEventArgs"/> instance containing the event data.</param>
|
/// <param name="e">The <see cref="SessionEndingEventArgs"/> instance containing the event data.</param>
|
||||||
static void SystemEvents_SessionEnding(object sender, SessionEndingEventArgs e)
|
static void SystemEvents_SessionEnding(object sender, SessionEndingEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.Reason == SessionEndReasons.SystemShutdown || _backgroundService == null)
|
if (e.Reason == SessionEndReasons.SystemShutdown || !_isRunningAsService)
|
||||||
{
|
{
|
||||||
Shutdown();
|
Shutdown();
|
||||||
}
|
}
|
||||||
|
@ -316,7 +358,7 @@ namespace MediaBrowser.ServerApplication
|
||||||
|
|
||||||
_logger.ErrorException("UnhandledException", exception);
|
_logger.ErrorException("UnhandledException", exception);
|
||||||
|
|
||||||
if (_backgroundService == null)
|
if (!_isRunningAsService)
|
||||||
{
|
{
|
||||||
_app.OnUnhandledException(exception);
|
_app.OnUnhandledException(exception);
|
||||||
}
|
}
|
||||||
|
@ -327,24 +369,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Releases the mutex.
|
|
||||||
/// </summary>
|
|
||||||
internal static void ReleaseMutex(ILogger logger)
|
|
||||||
{
|
|
||||||
if (_singleInstanceMutex == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.Debug("Releasing mutex");
|
|
||||||
|
|
||||||
_singleInstanceMutex.ReleaseMutex();
|
|
||||||
_singleInstanceMutex.Close();
|
|
||||||
_singleInstanceMutex.Dispose();
|
|
||||||
_singleInstanceMutex = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Performs the update if needed.
|
/// Performs the update if needed.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -378,40 +402,67 @@ namespace MediaBrowser.ServerApplication
|
||||||
|
|
||||||
public static void Shutdown()
|
public static void Shutdown()
|
||||||
{
|
{
|
||||||
if (_backgroundService != null)
|
if (_isRunningAsService)
|
||||||
{
|
{
|
||||||
_backgroundService.Stop();
|
ShutdownWindowsService();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_app.Dispatcher.Invoke(_app.Shutdown);
|
ShutdownWindowsApplication();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Restart()
|
public static void Restart()
|
||||||
{
|
{
|
||||||
// Second instance will start first, so release the mutex and dispose the http server ahead of time
|
_logger.Info("Disposing app host");
|
||||||
_app.Dispatcher.Invoke(() => ReleaseMutex(_logger));
|
|
||||||
|
|
||||||
_appHost.Dispose();
|
_appHost.Dispose();
|
||||||
|
|
||||||
|
_logger.Info("Starting new instance of server");
|
||||||
RestartInternal();
|
RestartInternal();
|
||||||
|
|
||||||
_app.Dispatcher.Invoke(_app.Shutdown);
|
_logger.Info("Shutting down existing instance of server.");
|
||||||
|
Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void RestartInternal()
|
private static void RestartInternal()
|
||||||
{
|
{
|
||||||
if (_backgroundService == null)
|
if (!_isRunningAsService)
|
||||||
{
|
{
|
||||||
System.Windows.Forms.Application.Restart();
|
_logger.Info("Starting server application");
|
||||||
|
RestartWindowsApplication();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//var controller = new ServiceController()
|
_logger.Info("Starting windows service");
|
||||||
//{
|
RestartWindowsService();
|
||||||
// ServiceName = BackgroundService.Name
|
}
|
||||||
//};
|
}
|
||||||
|
|
||||||
|
private static void RestartWindowsApplication()
|
||||||
|
{
|
||||||
|
System.Windows.Forms.Application.Restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void RestartWindowsService()
|
||||||
|
{
|
||||||
|
_isRestarting = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ShutdownWindowsApplication()
|
||||||
|
{
|
||||||
|
_app.Dispatcher.Invoke(_app.Shutdown);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ShutdownWindowsService()
|
||||||
|
{
|
||||||
|
_logger.Info("Stopping background service");
|
||||||
|
var service = new ServiceController(BackgroundService.Name);
|
||||||
|
|
||||||
|
service.Refresh();
|
||||||
|
|
||||||
|
if (service.Status == ServiceControllerStatus.Running)
|
||||||
|
{
|
||||||
|
service.Stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue