Updater will stop process by ID on mono

src/NzbDrone.Common/Processes/ProcessProvider.cs

@@ -21,6 +21,7 @@ public interface IProcessProvider
         void SetPriority(int processId, ProcessPriorityClass priority);
         void KillAll(string processName);
         void Kill(int processId);
+        Boolean Exists(int processId);
         Boolean Exists(string processName);
         ProcessPriorityClass GetCurrentProcessPriority();
         Process Start(string path, string args = null, Action<string> onOutputDataReceived = null, Action<string> onErrorDataReceived = null);
@@ -40,6 +41,11 @@ public ProcessInfo GetCurrentProcess()
             return ConvertToProcessInfo(Process.GetCurrentProcess());
         }
 
+        public bool Exists(int processId)
+        {
+            return GetProcessById(processId) != null;
+        }
+
         public Boolean Exists(string processName)
         {
             return GetProcessesByName(processName).Any();

src/NzbDrone.Update.Test/InstallUpdateServiceFixture.cs

@@ -2,9 +2,9 @@
 using System.IO;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 using NzbDrone.Test.Common;
 using NzbDrone.Update.UpdateEngine;
 
@@ -13,11 +13,28 @@ namespace NzbDrone.Update.Test
     [TestFixture]
     public class InstallUpdateServiceFixture : TestBase<InstallUpdateService>
     {
+        private string _targetFolder = @"C:\NzbDrone\".AsOsAgnostic();
+        private const int _processId = 12;
+
         [SetUp]
         public void Setup()
         {
             Mocker.GetMock<IAppFolderInfo>()
-                .Setup(c => c.TempFolder).Returns(@"C:\Temp\");
+                  .Setup(c => c.TempFolder).Returns(@"C:\Temp\");
+        }
+
+        private void GivenTargetFolderExists()
+        {
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(c => c.FolderExists(_targetFolder))
+                  .Returns(true);
+        }
+
+        private void GivenProcessExists()
+        {
+            Mocker.GetMock<IProcessProvider>()
+                  .Setup(c => c.Exists(_processId))
+                  .Returns(true);
         }
 
         [TestCase(null)]
@@ -25,16 +42,14 @@ public void Setup()
         [TestCase(" ")]
         public void update_should_throw_target_folder_is_blank(string target)
         {
-            Assert.Throws<ArgumentException>(() => Subject.Start(target))
+            Assert.Throws<ArgumentException>(() => Subject.Start(target, _processId))
             .Message.Should().StartWith("Target folder can not be null or empty");
         }
 
         [Test]
         public void update_should_throw_if_target_folder_doesnt_exist()
         {
-            string targetFolder = "c:\\NzbDrone\\";
+            Assert.Throws<DirectoryNotFoundException>(() => Subject.Start(_targetFolder, _processId))
-
-            Assert.Throws<DirectoryNotFoundException>(() => Subject.Start(targetFolder))
             .Message.Should().StartWith("Target folder doesn't exist");
         }
 
@@ -42,18 +57,34 @@ public void update_should_throw_if_target_folder_doesnt_exist()
         public void update_should_throw_if_update_folder_doesnt_exist()
         {
             const string sandboxFolder = @"C:\Temp\NzbDrone_update\nzbdrone";
-            const string targetFolder = "c:\\NzbDrone\\";
 
-            Mocker.GetMock<IDiskProvider>()
+            GivenTargetFolderExists();
-                .Setup(c => c.FolderExists(targetFolder))
+            GivenProcessExists();
-                .Returns(true);
 
             Mocker.GetMock<IDiskProvider>()
                .Setup(c => c.FolderExists(sandboxFolder))
                .Returns(false);
 
-            Assert.Throws<DirectoryNotFoundException>(() => Subject.Start(targetFolder))
+            Assert.Throws<DirectoryNotFoundException>(() => Subject.Start(_targetFolder, _processId))
                 .Message.Should().StartWith("Update folder doesn't exist");
         }
+
+        [Test]
+        public void update_should_throw_if_process_is_zero()
+        {
+            GivenTargetFolderExists();
+
+            Assert.Throws<ArgumentException>(() => Subject.Start(_targetFolder, 0))
+            .Message.Should().StartWith("Invalid process ID");
+        }
+
+        [Test]
+        public void update_should_throw_if_process_id_doesnt_exist()
+        {
+            GivenTargetFolderExists();
+
+            Assert.Throws<ArgumentException>(() => Subject.Start(_targetFolder, _processId))
+            .Message.Should().StartWith("Process with ID doesn't exist");
+        }
     }
 }

src/NzbDrone.Update.Test/ProgramFixture.cs

@@ -43,7 +43,7 @@ public void should_call_update_with_corret_path()
             Subject.Start(new[] { "12", "" });
 
 
-            Mocker.GetMock<IInstallUpdateService>().Verify(c => c.Start(@"C:\NzbDrone"), Times.Once());
+            Mocker.GetMock<IInstallUpdateService>().Verify(c => c.Start(@"C:\NzbDrone", 12), Times.Once());
         }
 
 

src/NzbDrone.Update/UpdateApp.cs

@@ -68,7 +68,7 @@ public void Start(string[] args)
             }
             
             logger.Info("Starting update process. Target Path:{0}", targetFolder);
-            _installUpdateService.Start(targetFolder);
+            _installUpdateService.Start(targetFolder, startupContext.ProcessId);
         }
 
         private UpdateStartupContext ParseArgs(string[] args)

src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs

@@ -4,12 +4,13 @@
 using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Processes;
 
 namespace NzbDrone.Update.UpdateEngine
 {
     public interface IInstallUpdateService
     {
-        void Start(string installationFolder);
+        void Start(string installationFolder, int processId);
     }
 
     public class InstallUpdateService : IInstallUpdateService
@@ -21,6 +22,7 @@ public class InstallUpdateService : IInstallUpdateService
         private readonly IBackupAndRestore _backupAndRestore;
         private readonly IBackupAppData _backupAppData;
         private readonly IStartNzbDrone _startNzbDrone;
+        private readonly IProcessProvider _processProvider;
         private readonly Logger _logger;
 
         public InstallUpdateService(IDiskProvider diskProvider,
@@ -30,6 +32,7 @@ public InstallUpdateService(IDiskProvider diskProvider,
                                     IBackupAndRestore backupAndRestore,
                                     IBackupAppData backupAppData,
                                     IStartNzbDrone startNzbDrone,
+                                    IProcessProvider processProvider,
                                     Logger logger)
         {
             _diskProvider = diskProvider;
@@ -39,10 +42,11 @@ public InstallUpdateService(IDiskProvider diskProvider,
             _backupAndRestore = backupAndRestore;
             _backupAppData = backupAppData;
             _startNzbDrone = startNzbDrone;
+            _processProvider = processProvider;
             _logger = logger;
         }
 
-        private void Verify(string targetFolder)
+        private void Verify(string targetFolder, int processId)
         {
             _logger.Info("Verifying requirements before update...");
 
@@ -52,20 +56,30 @@ private void Verify(string targetFolder)
             if (!_diskProvider.FolderExists(targetFolder))
                 throw new DirectoryNotFoundException("Target folder doesn't exist " + targetFolder);
 
+            if (processId < 1)
+            {
+                throw new ArgumentException("Invalid process ID: " + processId);
+            }
+
+            if (!_processProvider.Exists(processId))
+            {
+                throw new ArgumentException("Process with ID doesn't exist " + processId);
+            }
+
             _logger.Info("Verifying Update Folder");
             if (!_diskProvider.FolderExists(_appFolderInfo.GetUpdatePackageFolder()))
                 throw new DirectoryNotFoundException("Update folder doesn't exist " + _appFolderInfo.GetUpdatePackageFolder());
         }
 
-        public void Start(string installationFolder)
+        public void Start(string installationFolder, int processId)
         {
-            Verify(installationFolder);
+            Verify(installationFolder, processId);
 
             var appType = _detectApplicationType.GetAppType();
 
             try
             {
-                _terminateNzbDrone.Terminate();
+                _terminateNzbDrone.Terminate(processId);
 
                 _backupAndRestore.Backup(installationFolder);
                 _backupAppData.Backup();

src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs

@@ -9,7 +9,7 @@ namespace NzbDrone.Update.UpdateEngine
 {
     public interface ITerminateNzbDrone
     {
-        void Terminate();
+        void Terminate(int processId);
     }
 
     public class TerminateNzbDrone : ITerminateNzbDrone
@@ -25,11 +25,12 @@ public TerminateNzbDrone(IServiceProvider serviceProvider, IProcessProvider proc
             _logger = logger;
         }
 
-        public void Terminate()
+        public void Terminate(int processId)
         {
             if (OsInfo.IsMono)
             {
                 _logger.Info("Stopping all instances");
+                _processProvider.Kill(processId);
                 _processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME);
                 _processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME);