Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Fixed an issue where there could be a race condition during app update.

This commit is contained in:
kay.one 2012-02-26 13:22:35 -08:00
parent aa42111516
commit 39be4c567d
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NzbDrone.Common/ProcessProvider.cs
View File

@ -57,6 +57,12 @@ namespace NzbDrone.Common
return process; return process;
} }
public virtual void WaitForExit(Process process)
{
Logger.Trace("Waiting for process {0} to exit.", process.ProcessName);
process.WaitForExit();
}
public virtual void Kill(int processId) public virtual void Kill(int processId)
{ {
if (processId == 0 || !Process.GetProcesses().Any(p => p.Id == processId)) if (processId == 0 || !Process.GetProcesses().Any(p => p.Id == processId))

1
NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
View File

@ -2,6 +2,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using FizzWare.NBuilder;
using FluentAssertions; using FluentAssertions;
using Moq; using Moq;
using NUnit.Framework; using NUnit.Framework;

10
NzbDrone.Core/Jobs/AppUpdateJob.cs
View File

@ -82,12 +82,14 @@ namespace NzbDrone.Core.Jobs
logger.Info("Starting update client"); logger.Info("Starting update client");
var startInfo = new ProcessStartInfo var startInfo = new ProcessStartInfo
{ {
FileName = _enviromentProvider.GetUpdateClientExePath(), FileName = _enviromentProvider.GetUpdateClientExePath(),
Arguments = string.Format("{0} {1}", _enviromentProvider.NzbDroneProcessIdFromEnviroment, _configFileProvider.Guid) Arguments = string.Format("{0} {1}", _enviromentProvider.NzbDroneProcessIdFromEnviroment, _configFileProvider.Guid)
}; };
_processProvider.Start(startInfo); var process = _processProvider.Start(startInfo);
notification.CurrentMessage = "Update in progress. NzbDrone will restart shortly."; notification.CurrentMessage = "Update in progress. NzbDrone will restart shortly.";
_processProvider.WaitForExit(process);
} }
} }
} }