github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Issue #59 - Prevent failure when Child processes cannot be retrieved due to the system shutdown

pull/172/head
Oleg Nenashev 2016-12-24 21:40:57 +01:00
parent ab51b50d85
commit 10bcbde081
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Core/WinSWCore/Util/ProcessHelper.cs
View File

@ -90,23 +90,32 @@ namespace winsw.Util
/// <param name="stopParentProcessFirst">If enabled, the perent process will be terminated before its children on all levels</param> /// <param name="stopParentProcessFirst">If enabled, the perent process will be terminated before its children on all levels</param>
public static void StopProcessAndChildren(int pid, TimeSpan stopTimeout, bool stopParentProcessFirst) public static void StopProcessAndChildren(int pid, TimeSpan stopTimeout, bool stopParentProcessFirst)
{ {
var childPids = GetChildPids(pid); List<int> childPids = null;
try
if (stopParentProcessFirst)
{ {
StopProcess(pid, stopTimeout); childPids = GetChildPids(pid);
}
catch (Exception ex)
{
Logger.Warn("Failed to locate children of the process with PID=" + pid + ". Child processes won't be terminated", ex);
}
if (!stopParentProcessFirst && childPids != null)
{
foreach (var childPid in childPids) foreach (var childPid in childPids)
{ {
StopProcessAndChildren(childPid, stopTimeout, stopParentProcessFirst); StopProcessAndChildren(childPid, stopTimeout, stopParentProcessFirst);
} }
} }
else
StopProcess(pid, stopTimeout);
if (stopParentProcessFirst && childPids != null)
{ {
foreach (var childPid in childPids) foreach (var childPid in childPids)
{ {
StopProcessAndChildren(childPid, stopTimeout, stopParentProcessFirst); StopProcessAndChildren(childPid, stopTimeout, stopParentProcessFirst);
} }
StopProcess(pid, stopTimeout);
} }
} }