diff --git a/src/Ombi.Updater/Installer.cs b/src/Ombi.Updater/Installer.cs index ab7f92ed4..4827d45f9 100644 --- a/src/Ombi.Updater/Installer.cs +++ b/src/Ombi.Updater/Installer.cs @@ -34,27 +34,27 @@ namespace Ombi.Updater } // Make sure the process has been killed - while (p.FindProcessByName(opt.ProcessName).Any()) + while (p.FindProcessByName(opt.ProcessName).Any()) + { + Thread.Sleep(500); + _log.LogDebug("Found another process called {0}, KILLING!", opt.ProcessName); + var proc = p.FindProcessByName(opt.ProcessName).FirstOrDefault(); + if (proc != null) { - Thread.Sleep(500); - _log.LogDebug("Found another process called {0}, KILLING!", opt.ProcessName); - var proc = p.FindProcessByName(opt.ProcessName).FirstOrDefault(); - if (proc != null) - { - _log.LogDebug($"[{proc.Id}] - {proc.Name} - Path: {proc.StartPath}"); - opt.OmbiProcessId = proc.Id; - p.Kill(opt); - } + _log.LogDebug($"[{proc.Id}] - {proc.Name} - Path: {proc.StartPath}"); + opt.OmbiProcessId = proc.Id; + p.Kill(opt); } - - _log.LogDebug("Starting to move the files"); - MoveFiles(opt); - _log.LogDebug("Files replaced"); - // Start Ombi - StartOmbi(opt); } - private void StartOmbi(StartupOptions options) + _log.LogDebug("Starting to move the files"); + MoveFiles(opt); + _log.LogDebug("Files replaced"); + // Start Ombi + StartOmbi(opt); + } + + private void StartOmbi(StartupOptions options) { _log.LogDebug("Starting ombi"); var fileName = "Ombi.exe"; @@ -72,7 +72,7 @@ namespace Ombi.Updater Arguments = $"/C net start \"{options.WindowsServiceName}\"" }; - using (var process = new Process{StartInfo = startInfo}) + using (var process = new Process { StartInfo = startInfo }) { process.Start(); } diff --git a/src/Ombi.Updater/Program.cs b/src/Ombi.Updater/Program.cs index 8cbaabb03..612d9d3fb 100644 --- a/src/Ombi.Updater/Program.cs +++ b/src/Ombi.Updater/Program.cs @@ -1,14 +1,10 @@ using System; -using System.Diagnostics; using System.IO; -using System.Linq; using CommandLine; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Serilog; -using Serilog.Events; -using ILogger = Serilog.ILogger; namespace Ombi.Updater {