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

Merge pull request #417 from NextTurn/setstatus 

Fix `<waithint>` setting
pull/513/head
Oleg Nenashev 2020-05-10 23:16:09 +02:00 committed by GitHub
parent 3ca706678c e37c641520
commit f4c5f825bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/ServiceWrapper/Main.cs
View File

@ -367,7 +367,6 @@ namespace winsw
Log.Debug("WaitForProcessToExit " + _process.Id + "+" + stopProcess.Id); Log.Debug("WaitForProcessToExit " + _process.Id + "+" + stopProcess.Id);
WaitForProcessToExit(_process); WaitForProcessToExit(_process);
WaitForProcessToExit(stopProcess); WaitForProcessToExit(stopProcess);
SignalShutdownComplete();
} }
// Stop extensions // Stop extensions
@ -429,12 +428,7 @@ namespace winsw
effectiveWaitHint = (int)_descriptor.WaitHint.TotalMilliseconds; effectiveWaitHint = (int)_descriptor.WaitHint.TotalMilliseconds;
} }
IntPtr handle = ServiceHandle; RequestAdditionalTime(effectiveWaitHint);
_wrapperServiceStatus.checkPoint++;
_wrapperServiceStatus.waitHint = effectiveWaitHint;
// WriteEvent("SignalShutdownPending " + wrapperServiceStatus.checkPoint + ":" + wrapperServiceStatus.waitHint);
_wrapperServiceStatus.currentState = (int)State.SERVICE_STOP_PENDING;
Advapi32.SetServiceStatus(handle, _wrapperServiceStatus);
} }
private void SignalShutdownComplete() private void SignalShutdownComplete()