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

Fixed #1760 and improvements on the auto updater.

Browse source 
We may now support windows services... #1460
This commit is contained in:
Jamie 2017-11-30 15:30:58 +00:00
commit 02135bc550
15 changed files with 170 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/Ombi.Updater/ProcessProvider.cs
View file

@ -73,29 +73,46 @@ namespace Ombi.Updater
process.PriorityClass = priority;
}
public void Kill(int processId)
public void Kill(StartupOptions opts)
{
var process = Process.GetProcesses().FirstOrDefault(p => p.Id == processId);
if (process == null)
if (opts.IsWindowsService)
{
Console.WriteLine("Cannot find process with id: {0}", processId);
return;
Console.WriteLine("Stopping Service {0}", opts.WindowsServiceName);
var process = new Process();
var startInfo =
new ProcessStartInfo
{
WindowStyle = ProcessWindowStyle.Hidden,
FileName = "cmd.exe",
Arguments = $"/C net stop \"{opts.WindowsServiceName}\""
};
process.StartInfo = startInfo;
process.Start();
}
process.Refresh();
if (process.Id != Process.GetCurrentProcess().Id && process.HasExited)
else
{
Console.WriteLine("Process has already exited");
return;
}
var process = Process.GetProcesses().FirstOrDefault(p => p.Id == opts.OmbiProcessId);
Console.WriteLine("[{0}]: Killing process", process.Id);
process.Kill();
Console.WriteLine("[{0}]: Waiting for exit", process.Id);
process.WaitForExit();
Console.WriteLine("[{0}]: Process terminated successfully", process.Id);
if (process == null)
{
Console.WriteLine("Cannot find process with id: {0}", opts.OmbiProcessId);
return;
}
process.Refresh();
if (process.Id != Process.GetCurrentProcess().Id && process.HasExited)
{
Console.WriteLine("Process has already exited");
return;
}
Console.WriteLine("[{0}]: Killing process", process.Id);
process.Kill();
Console.WriteLine("[{0}]: Waiting for exit", process.Id);
process.WaitForExit();
Console.WriteLine("[{0}]: Process terminated successfully", process.Id);
}
}
public void KillAll(string processName)
@ -113,7 +130,7 @@ namespace Ombi.Updater
}
Console.WriteLine("Killing process: {0} [{1}]", processInfo.Id, processInfo.ProcessName);
Kill(processInfo.Id);
Kill(new StartupOptions{OmbiProcessId = processInfo.Id});
}
}