char flags[CMD_LENGTH];\r
char dir[MAX_PATH];\r
bool stopping;\r
+unsigned long throttle_delay;\r
CRITICAL_SECTION throttle_section;\r
CONDITION_VARIABLE throttle_condition;\r
\r
\r
/* Arguments are optional */\r
char *flags;\r
- if (argc == 2) flags = "";\r
- else flags = argv[2];\r
+ size_t flagslen = 0;\r
+ size_t s = 0;\r
+ int i;\r
+ for (i = 2; i < argc; i++) flagslen += strlen(argv[i]) + 1;\r
+ if (! flagslen) flagslen = 1;\r
+\r
+ flags = (char *) HeapAlloc(GetProcessHeap(), 0, flagslen);\r
+ if (! flags) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "flags", "pre_install_service()", 0);\r
+ return 2;\r
+ }\r
+ ZeroMemory(flags, flagslen);\r
+\r
+ /*\r
+ This probably isn't UTF8-safe and should use std::string or something\r
+ but it's been broken for the best part of a decade and due for a rewrite\r
+ anyway so it'll do as a quick-'n'-dirty fix. Note that we don't free\r
+ the flags buffer but as the program exits that isn't a big problem.\r
+ */\r
+ for (i = 2; i < argc; i++) {\r
+ size_t len = strlen(argv[i]);\r
+ memmove(flags + s, argv[i], len);\r
+ s += len;\r
+ if (i < argc - 1) flags[s++] = ' ';\r
+ }\r
\r
return install_service(argv[0], argv[1], flags);\r
}\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\" %s", path, NSSM_RUN) < 0) {\r
fprintf(stderr, "Out of memory for ImagePath!\n");\r
return 4;\r
}\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
- return;\r
- }\r
-\r
- /* Get startup parameters */\r
- int ret = get_parameters(argv[0], exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));\r
- if (ret) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, argv[0], 0);\r
- service_status.dwCurrentState = SERVICE_STOPPED;\r
- /* An accurate, if not particularly helpful, status */\r
- service_status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE;\r
- SetServiceStatus(service_handle, &service_status);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED, error_string(GetLastError()), 0);\r
return;\r
}\r
\r
service_status.dwCurrentState = SERVICE_START_PENDING;\r
- service_status.dwWaitHint = NSSM_RESET_THROTTLE_RESTART + NSSM_WAITHINT_MARGIN;\r
+ service_status.dwWaitHint = throttle_delay + NSSM_WAITHINT_MARGIN;\r
SetServiceStatus(service_handle, &service_status);\r
\r
/* Try to create the exit action parameters; we don't care if it fails */\r
int ret = start_service();\r
if (ret) {\r
char code[16];\r
- snprintf(code, sizeof(code), "%d", ret);\r
+ _snprintf(code, sizeof(code), "%d", ret);\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);\r
return ret;\r
}\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
PROCESS_INFORMATION pi;\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
+ 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
+\r
/* Launch executable with arguments */\r
char cmd[CMD_LENGTH];\r
if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {\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
SetServiceStatus(service_handle, &service_status);\r
\r
/* Wait for a clean startup. */\r
- if (WaitForSingleObject(process_handle, NSSM_RESET_THROTTLE_RESTART) == WAIT_TIMEOUT) throttle = 0;\r
+ if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;\r
\r
return 0;\r
}\r
if (throttle > 7) throttle = 8;\r
\r
char threshold[8], milliseconds[8];\r
- _snprintf(threshold, sizeof(threshold), "%d", NSSM_RESET_THROTTLE_RESTART);\r
+ _snprintf(threshold, sizeof(threshold), "%d", throttle_delay);\r
_snprintf(milliseconds, sizeof(milliseconds), "%d", ms);\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);\r
\r