git://git.iain.cx/iain
/
nssm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use await_shutdown().
[nssm.git]
/
service.cpp
diff --git
a/service.cpp
b/service.cpp
index
028b035
..
5c6adaf
100644
(file)
--- a/
service.cpp
+++ b/
service.cpp
@@
-459,7
+459,7
@@
int stop_service(unsigned long exitcode, bool graceful, bool default_action) {
if (pid) {
\r
/* Shut down service */
\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);
\r
if (pid) {
\r
/* Shut down service */
\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);
\r
- kill_process(service_name, stop_method, process_handle, pid, 0);
\r
+ kill_process(service_name, s
ervice_handle, &service_status, s
top_method, process_handle, pid, 0);
\r
}
\r
else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);
\r
\r
}
\r
else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);
\r
\r
@@
-509,7
+509,7
@@
void CALLBACK end_service(void *arg, unsigned char why) {
\r
/* Clean up. */
\r
if (exitcode == STILL_ACTIVE) exitcode = 0;
\r
\r
/* Clean up. */
\r
if (exitcode == STILL_ACTIVE) exitcode = 0;
\r
- kill_process_tree(service_name, stop_method, pid, exitcode, pid, &creation_time, &exit_time);
\r
+ kill_process_tree(service_name, s
ervice_handle, &service_status, s
top_method, pid, exitcode, pid, &creation_time, &exit_time);
\r
\r
/*
\r
The why argument is true if our wait timed out or false otherwise.
\r
\r
/*
\r
The why argument is true if our wait timed out or false otherwise.
\r