shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updater: try SIGTERM first

Browse Source
This commit is contained in:
kaso17
2018-09-03 16:35:56 +02:00
parent 88858022af
commit aba9e6db47
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Jackett.Updater/Program.cs
View File

@@ -87,10 +87,33 @@ namespace Jackett.Updater
{ {
var proc = Process.GetProcessById(pid); var proc = Process.GetProcessById(pid);
logger.Info("Killing process " + proc.Id); logger.Info("Killing process " + proc.Id);
proc.Kill();
var exited = proc.WaitForExit(5000); // try to kill gracefully (on unix) first, see #3692
var exited = false;
if (Environment.OSVersion.Platform == PlatformID.Unix)
{
try
{
var startInfo = new ProcessStartInfo();
startInfo.Arguments = "-15 " + pid;
startInfo.FileName = "kill";
Process.Start(startInfo);
exited = proc.WaitForExit(5000);
}
catch (Exception e)
{
logger.Error(e, "Error while sending SIGTERM to " + pid.ToString());
}
if (!exited) if (!exited)
logger.Info("Process " + pid.ToString() + " didn't exit within 5 seconds"); logger.Info("Process " + pid.ToString() + " didn't exit within 5 seconds after a SIGTERM");
}
if (!exited)
{
proc.Kill(); // send SIGKILL
}
exited = proc.WaitForExit(5000);
if (!exited)
logger.Info("Process " + pid.ToString() + " didn't exit within 5 seconds after a SIGKILL");
} }
catch (ArgumentException) catch (ArgumentException)
{ {