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
Fix event logging.
[nssm.git]
/
service.cpp
diff --git
a/service.cpp
b/service.cpp
index
395e76e
..
a90d508
100644
(file)
--- a/
service.cpp
+++ b/
service.cpp
@@
-194,7
+194,7
@@
void WINAPI service_main(unsigned long argc, char **argv) {
/* Register control handler */
\r
service_handle = RegisterServiceCtrlHandlerEx(NSSM, service_control_handler, 0);
\r
if (! service_handle) {
\r
/* Register control handler */
\r
service_handle = RegisterServiceCtrlHandlerEx(NSSM, service_control_handler, 0);
\r
if (! service_handle) {
\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED,
GetLastError(
), 0);
\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED,
error_string(GetLastError()
), 0);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-254,7
+254,7
@@
int monitor_service() {
\r
/* Monitor service service */
\r
if (! RegisterWaitForSingleObject(&wait_handle, process_handle, end_service, (void *) pid, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {
\r
\r
/* Monitor service service */
\r
if (! RegisterWaitForSingleObject(&wait_handle, process_handle, end_service, (void *) pid, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {
\r
- log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe,
GetLastError(
), 0);
\r
+ log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe,
error_string(GetLastError()
), 0);
\r
}
\r
\r
return 0;
\r
}
\r
\r
return 0;
\r
@@
-314,7
+314,7
@@
int start_service() {
throttle_restart();
\r
\r
if (! CreateProcess(0, cmd, 0, 0, false, 0, 0, dir, &si, &pi)) {
\r
throttle_restart();
\r
\r
if (! CreateProcess(0, cmd, 0, 0, false, 0, 0, dir, &si, &pi)) {
\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe,
GetLastError(
), 0);
\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe,
error_string(GetLastError()
), 0);
\r
return stop_service(3, true, true);
\r
}
\r
process_handle = pi.hProcess;
\r
return stop_service(3, true, true);
\r
}
\r
process_handle = pi.hProcess;
\r