\r
/* Construct command */\r
char command[CMD_LENGTH];\r
- size_t runlen = strlen(NSSM_RUN);\r
size_t pathlen = strlen(path);\r
- if (pathlen + runlen + 2 >= VALUE_LENGTH) {\r
+ if (pathlen + 1 >= VALUE_LENGTH) {\r
fprintf(stderr, "The full path to " NSSM " is too long!\n");\r
return 3;\r
}\r
- if (_snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
+ if (_snprintf(command, sizeof(command), "\"%s\"", path) < 0) {\r
fprintf(stderr, "Out of memory for ImagePath!\n");\r
return 4;\r
}\r
return;\r
}\r
\r
+ log_service_control(service_name, 0, true);\r
+\r
service_status.dwCurrentState = SERVICE_START_PENDING;\r
service_status.dwWaitHint = throttle_delay + NSSM_WAITHINT_MARGIN;\r
SetServiceStatus(service_handle, &service_status);\r
\r
/* Used for signalling a resume if the service pauses when throttled. */\r
throttle_timer = CreateWaitableTimer(0, 1, 0);\r
+ if (! throttle_timer) {\r
+ log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_CREATEWAITABLETIMER_FAILED, service_name, error_string(GetLastError()), 0);\r
+ }\r
\r
monitor_service();\r
}\r
return 0;\r
}\r
\r
+char *service_control_text(unsigned long control) {\r
+ switch (control) {\r
+ /* HACK: there is no SERVICE_CONTROL_START constant */\r
+ case 0: return "START";\r
+ case SERVICE_CONTROL_STOP: return "STOP";\r
+ case SERVICE_CONTROL_SHUTDOWN: return "SHUTDOWN";\r
+ case SERVICE_CONTROL_PAUSE: return "PAUSE";\r
+ case SERVICE_CONTROL_CONTINUE: return "CONTINUE";\r
+ case SERVICE_CONTROL_INTERROGATE: return "INTERROGATE";\r
+ default: return 0;\r
+ }\r
+}\r
+\r
+void log_service_control(char *service_name, unsigned long control, bool handled) {\r
+ char *text = service_control_text(control);\r
+ unsigned long event;\r
+\r
+ if (! text) {\r
+ /* "0x" + 8 x hex + NULL */\r
+ text = (char *) HeapAlloc(GetProcessHeap(), 0, 11);\r
+ if (! text) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);\r
+ return;\r
+ }\r
+ if (_snprintf(text, 11, "0x%08x", control) < 0) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);\r
+ HeapFree(GetProcessHeap(), 0, text);\r
+ return;\r
+ }\r
+\r
+ event = NSSM_EVENT_SERVICE_CONTROL_UNKNOWN;\r
+ }\r
+ else if (handled) event = NSSM_EVENT_SERVICE_CONTROL_HANDLED;\r
+ else event = NSSM_EVENT_SERVICE_CONTROL_NOT_HANDLED;\r
+\r
+ log_event(EVENTLOG_INFORMATION_TYPE, event, service_name, text, 0);\r
+\r
+ if (event == NSSM_EVENT_SERVICE_CONTROL_UNKNOWN) {\r
+ HeapFree(GetProcessHeap(), 0, text);\r
+ }\r
+}\r
+\r
/* Service control handler */\r
unsigned long WINAPI service_control_handler(unsigned long control, unsigned long event, void *data, void *context) {\r
switch (control) {\r
case SERVICE_CONTROL_SHUTDOWN:\r
case SERVICE_CONTROL_STOP:\r
+ log_service_control(service_name, control, true);\r
stop_service(0, true, true);\r
return NO_ERROR;\r
\r
case SERVICE_CONTROL_CONTINUE:\r
+ log_service_control(service_name, control, true);\r
+ if (! throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;\r
throttle = 0;\r
ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
We don't accept pause messages but it isn't possible to register\r
only for continue messages so we have to handle this case.\r
*/\r
+ log_service_control(service_name, control, false);\r
return ERROR_CALL_NOT_IMPLEMENTED;\r
}\r
\r
/* Unknown control */\r
+ log_service_control(service_name, control, false);\r
return ERROR_CALL_NOT_IMPLEMENTED;\r
}\r
\r
ZeroMemory(&pi, sizeof(pi));\r
\r
/* Get startup parameters */\r
- int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &throttle_delay);\r
+ char *env = 0;\r
+ int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay);\r
if (ret) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);\r
return stop_service(2, true, true);\r
\r
/* Launch executable with arguments */\r
char cmd[CMD_LENGTH];\r
- if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {\r
+ if (_snprintf(cmd, sizeof(cmd), "\"%s\" %s", exe, flags) < 0) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);\r
return stop_service(2, true, true);\r
}\r
\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, error_string(GetLastError()), 0);\r
+ if (! CreateProcess(0, cmd, 0, 0, false, 0, env, dir, &si, &pi)) {\r
+ unsigned long error = GetLastError();\r
+ if (error == ERROR_INVALID_PARAMETER && env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service_name, exe, NSSM_REG_ENV, 0);\r
+ else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(error), 0);\r
return stop_service(3, true, true);\r
}\r
process_handle = pi.hProcess;\r
_snprintf(milliseconds, sizeof(milliseconds), "%d", ms);\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);\r
\r
- ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
- throttle_duetime.QuadPart = 0 - (ms * 10000);\r
- SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
+ if (throttle_timer) {\r
+ ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));\r
+ throttle_duetime.QuadPart = 0 - (ms * 10000LL);\r
+ SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);\r
+ }\r
\r
service_status.dwCurrentState = SERVICE_PAUSED;\r
SetServiceStatus(service_handle, &service_status);\r
\r
- WaitForSingleObject(throttle_timer, INFINITE);\r
+ if (throttle_timer) WaitForSingleObject(throttle_timer, INFINITE);\r
+ else Sleep(ms);\r
}\r
git://git.iain.cx/iain / nssm.git / blobdiff