github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 04:49:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

!cosmetic

Browse source
This commit is contained in:
Jamie 2018-02-20 08:23:18 +00:00
commit cd2026f297
2 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Ombi.Updater/Installer.cs
View file

@ -34,27 +34,27 @@ namespace Ombi.Updater
} }
// Make sure the process has been killed // 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($"[{proc.Id}] - {proc.Name} - Path: {proc.StartPath}");
_log.LogDebug("Found another process called {0}, KILLING!", opt.ProcessName); opt.OmbiProcessId = proc.Id;
var proc = p.FindProcessByName(opt.ProcessName).FirstOrDefault(); p.Kill(opt);
if (proc != null)
{
_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"); _log.LogDebug("Starting ombi");
var fileName = "Ombi.exe"; var fileName = "Ombi.exe";
@ -72,7 +72,7 @@ namespace Ombi.Updater
Arguments = $"/C net start \"{options.WindowsServiceName}\"" Arguments = $"/C net start \"{options.WindowsServiceName}\""
}; };
using (var process = new Process{StartInfo = startInfo}) using (var process = new Process { StartInfo = startInfo })
{ {
process.Start(); process.Start();
} }

4
src/Ombi.Updater/Program.cs
View file

@ -1,14 +1,10 @@
using System; using System;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq;
using CommandLine; using CommandLine;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Serilog; using Serilog;
using Serilog.Events;
using ILogger = Serilog.ILogger;
namespace Ombi.Updater namespace Ombi.Updater
{ {