michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2851 from MediaBrowser/dev

Browse Source 
3.2.30.1
This commit is contained in:
Luke 2017-08-28 14:19:45 -04:00 committed by GitHub
commit f70e89130b
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Mono/MonoAppHost.cs
View File

@ -12,8 +12,6 @@ using MediaBrowser.IsoMounter;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.System;
using MediaBrowser.Model.Updates;
using MediaBrowser.Server.Startup.Common;
namespace MediaBrowser.Server.Mono
{
@ -44,7 +42,7 @@ namespace MediaBrowser.Server.Mono
protected override void RestartInternal()
{
MainClass.Restart(StartupOptions);
MainClass.Restart();
}
protected override List<Assembly> GetAssembliesWithPartsInternal()

32
MediaBrowser.Server.Mono/Program.cs
View File

@ -33,6 +33,9 @@ namespace MediaBrowser.Server.Mono
private static ILogger _logger;
private static IFileSystem FileSystem;
private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();
private static bool _restartOnShutdown;
public static void Main(string[] args)
{
var applicationPath = Assembly.GetEntryAssembly().Location;
@ -63,9 +66,13 @@ namespace MediaBrowser.Server.Mono
}
finally
{
logger.Info("Shutting down");
_logger.Info("Disposing app host");
_appHost.Dispose();
if (_restartOnShutdown)
{
StartNewInstance(options);
}
}
}
@ -86,8 +93,6 @@ namespace MediaBrowser.Server.Mono
return new ServerApplicationPaths(programDataPath, appFolderPath, Path.GetDirectoryName(applicationPath));
}
private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();
private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options)
{
// Allow all https requests
@ -243,11 +248,15 @@ namespace MediaBrowser.Server.Mono
ApplicationTaskCompletionSource.SetResult(true);
}
public static void Restart(StartupOptions startupOptions)
public static void Restart()
{
_logger.Info("Disposing app host");
_appHost.Dispose();
_restartOnShutdown = true;
Shutdown();
}
private static void StartNewInstance(StartupOptions startupOptions)
{
_logger.Info("Starting new instance");
string module = startupOptions.GetOption("-restartpath");
@ -260,9 +269,9 @@ namespace MediaBrowser.Server.Mono
if (!startupOptions.ContainsOption("-restartargs"))
{
var args = Environment.GetCommandLineArgs()
.Skip(1)
.Select(NormalizeCommandLineArgument)
.ToArray();
.Skip(1)
.Select(NormalizeCommandLineArgument)
.ToArray();
commandLineArgsString = string.Join(" ", args);
}
@ -271,9 +280,6 @@ namespace MediaBrowser.Server.Mono
_logger.Info("Arguments: {0}", commandLineArgsString);
Process.Start(module, commandLineArgsString);
_logger.Info("Calling Environment.Exit");
Environment.Exit(0);
}
private static string NormalizeCommandLineArgument(string arg)

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.29.2")]
[assembly: AssemblyVersion("3.2.30.1")]