mirror of https://github.com/lidarr/Lidarr
Added update check early in startup if the package requested a post-install update check
This commit is contained in:
parent
d0b080f477
commit
22be6820f8
|
@ -0,0 +1,8 @@
|
|||
using NzbDrone.Common.Messaging;
|
||||
|
||||
namespace NzbDrone.Core.Lifecycle
|
||||
{
|
||||
public class ApplicationStartingEvent : IEvent
|
||||
{
|
||||
}
|
||||
}
|
|
@ -1,6 +1,8 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using NLog;
|
||||
using NzbDrone.Common;
|
||||
using NzbDrone.Common.Disk;
|
||||
|
@ -11,12 +13,14 @@ using NzbDrone.Common.Instrumentation.Extensions;
|
|||
using NzbDrone.Common.Processes;
|
||||
using NzbDrone.Core.Backup;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Lifecycle;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
using NzbDrone.Core.Update.Commands;
|
||||
|
||||
namespace NzbDrone.Core.Update
|
||||
{
|
||||
public class InstallUpdateService : IExecute<ApplicationUpdateCheckCommand>, IExecute<ApplicationUpdateCommand>
|
||||
public class InstallUpdateService : IExecute<ApplicationUpdateCheckCommand>, IExecute<ApplicationUpdateCommand>, IHandle<ApplicationStartingEvent>
|
||||
{
|
||||
private readonly ICheckUpdateService _checkUpdateService;
|
||||
private readonly Logger _logger;
|
||||
|
@ -75,7 +79,7 @@ namespace NzbDrone.Core.Update
|
|||
_logger = logger;
|
||||
}
|
||||
|
||||
private void InstallUpdate(UpdatePackage updatePackage)
|
||||
private bool InstallUpdate(UpdatePackage updatePackage)
|
||||
{
|
||||
EnsureAppDataSafety();
|
||||
|
||||
|
@ -95,6 +99,12 @@ namespace NzbDrone.Core.Update
|
|||
}
|
||||
}
|
||||
|
||||
if (_appFolderInfo.StartUpFolder.EndsWith("_output"))
|
||||
{
|
||||
_logger.ProgressDebug("Running in developer environment, not updating.");
|
||||
return false;
|
||||
}
|
||||
|
||||
var updateSandboxFolder = _appFolderInfo.GetUpdateSandboxFolder();
|
||||
|
||||
var packageDestination = Path.Combine(updateSandboxFolder, updatePackage.FileName);
|
||||
|
@ -130,24 +140,13 @@ namespace NzbDrone.Core.Update
|
|||
if (OsInfo.IsNotWindows && _configFileProvider.UpdateMechanism == UpdateMechanism.Script)
|
||||
{
|
||||
InstallUpdateWithScript(updateSandboxFolder);
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
|
||||
_logger.Info("Preparing client");
|
||||
_diskTransferService.TransferFolder(_appFolderInfo.GetUpdateClientFolder(), updateSandboxFolder, TransferMode.Move, false);
|
||||
|
||||
// Set executable flag on update app
|
||||
<<<<<<< HEAD
|
||||
if (OsInfo.IsOsx)
|
||||
{
|
||||
_diskProvider.SetPermissions(_appFolderInfo.GetUpdateClientExePath(updatePackage.Version), "0755", null, null);
|
||||
}
|
||||
|
||||
_logger.Info("Starting update client {0}", _appFolderInfo.GetUpdateClientExePath(updatePackage.Version));
|
||||
_logger.ProgressInfo("Lidarr will restart shortly.");
|
||||
|
||||
_processProvider.Start(_appFolderInfo.GetUpdateClientExePath(updatePackage.Version), GetUpdaterArgs(updateSandboxFolder));
|
||||
=======
|
||||
if (OsInfo.IsOsx || (OsInfo.IsLinux && PlatformInfo.IsNetCore))
|
||||
{
|
||||
_diskProvider.SetPermissions(_appFolderInfo.GetUpdateClientExePath(updatePackage.Runtime), "0755", null, null);
|
||||
|
@ -157,7 +156,8 @@ namespace NzbDrone.Core.Update
|
|||
_logger.ProgressInfo("Lidarr will restart shortly.");
|
||||
|
||||
_processProvider.Start(_appFolderInfo.GetUpdateClientExePath(updatePackage.Runtime), GetUpdaterArgs(updateSandboxFolder));
|
||||
>>>>>>> 4346c76d4... New: Multi target net framework 4.6.2 and net core 3.0
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void EnsureValidBranch(UpdatePackage package)
|
||||
|
@ -293,5 +293,63 @@ namespace NzbDrone.Core.Update
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void Handle(ApplicationStartingEvent message)
|
||||
{
|
||||
// Check if we have to do an application update on startup
|
||||
try
|
||||
{
|
||||
// Don't do a prestartup update check unless BuiltIn update is enabled
|
||||
if (_configFileProvider.UpdateAutomatically ||
|
||||
_configFileProvider.UpdateMechanism != UpdateMechanism.BuiltIn ||
|
||||
_deploymentInfoProvider.IsExternalUpdateMechanism)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var updateMarker = Path.Combine(_appFolderInfo.AppDataFolder, "update_required");
|
||||
if (!_diskProvider.FileExists(updateMarker))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.Debug("Post-install update check requested");
|
||||
|
||||
var latestAvailable = _checkUpdateService.AvailableUpdate();
|
||||
if (latestAvailable == null)
|
||||
{
|
||||
_logger.Debug("No post-install update available");
|
||||
_diskProvider.DeleteFile(updateMarker);
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.Info("Installing post-install update from {0} to {1}", BuildInfo.Version, latestAvailable.Version);
|
||||
_diskProvider.DeleteFile(updateMarker);
|
||||
|
||||
var installing = InstallUpdate(latestAvailable);
|
||||
|
||||
if (installing)
|
||||
{
|
||||
_logger.Debug("Install in progress, giving installer 30 seconds.");
|
||||
|
||||
var watch = Stopwatch.StartNew();
|
||||
|
||||
while (watch.Elapsed < TimeSpan.FromSeconds(30))
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
|
||||
_logger.Error("Post-install update not completed within 30 seconds. Attempting to continue normal operation.");
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Debug("Post-install update cancelled for unknown reason. Attempting to continue normal operation.");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Error(ex, "Failed to perform the post-install update check. Attempting to continue normal operation.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -90,6 +90,14 @@ namespace NzbDrone.Host
|
|||
|
||||
_runtimeInfo.IsExiting = false;
|
||||
DbFactory.RegisterDatabase(_container);
|
||||
|
||||
_container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartingEvent());
|
||||
|
||||
if (_runtimeInfo.IsExiting)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_hostController.StartServer();
|
||||
|
||||
if (!_startupContext.Flags.Contains(StartupContext.NO_BROWSER)
|
||||
|
|
Loading…
Reference in New Issue