else if (editing) RegDeleteValue(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD);\r
if (service->kill_threads_delay != NSSM_KILL_THREADS_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, service->kill_threads_delay);\r
else if (editing) RegDeleteValue(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD);\r
+ if (! service->kill_process_tree) set_number(key, NSSM_REG_KILL_PROCESS_TREE, 0);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_KILL_PROCESS_TREE);\r
if (service->stdin_path[0] || editing) {\r
if (service->stdin_path[0]) set_expand_string(key, NSSM_REG_STDIN, service->stdin_path);\r
else if (editing) RegDeleteValue(key, NSSM_REG_STDIN);\r
else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION);\r
if (service->stdout_flags != NSSM_STDOUT_FLAGS) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS, service->stdout_flags);\r
else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS);\r
+ if (service->stdout_copy_and_truncate) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_COPY_AND_TRUNCATE, 1);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_COPY_AND_TRUNCATE);\r
}\r
if (service->stderr_path[0] || editing) {\r
if (service->stderr_path[0]) set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);\r
else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION);\r
if (service->stderr_flags != NSSM_STDERR_FLAGS) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS, service->stderr_flags);\r
else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS);\r
+ if (service->stderr_copy_and_truncate) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_COPY_AND_TRUNCATE, 1);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_COPY_AND_TRUNCATE);\r
}\r
if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);\r
else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE);\r
else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_LOW);\r
if (service->rotate_bytes_high) set_number(key, NSSM_REG_ROTATE_BYTES_HIGH, service->rotate_bytes_high);\r
else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_HIGH);\r
+ if (service->rotate_delay != NSSM_ROTATE_DELAY) set_number(key, NSSM_REG_ROTATE_DELAY, service->rotate_delay);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_DELAY);\r
if (service->no_console) set_number(key, NSSM_REG_NO_CONSOLE, 1);\r
else if (editing) RegDeleteValue(key, NSSM_REG_NO_CONSOLE);\r
\r
/* Actually get the strings */\r
ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) *env, envlen);\r
if (ret != ERROR_SUCCESS) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
HeapFree(GetProcessHeap(), 0, *env);\r
*env = 0;\r
*envlen = 0;\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
return 4;\r
}\r
\r
return get_number(key, value, number, true);\r
}\r
\r
+/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */\r
+int format_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **formatted, unsigned long *newlen) {\r
+ unsigned long i, j;\r
+ *newlen = dnlen;\r
+\r
+ if (! *newlen) {\r
+ *formatted = 0;\r
+ return 0;\r
+ }\r
+\r
+ for (i = 0; i < dnlen; i++) if (! dn[i] && dn[i + 1]) ++*newlen;\r
+\r
+ *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
+ if (! *formatted) {\r
+ *newlen = 0;\r
+ return 1;\r
+ }\r
+\r
+ for (i = 0, j = 0; i < dnlen; i++) {\r
+ (*formatted)[j] = dn[i];\r
+ if (! dn[i]) {\r
+ if (dn[i + 1]) {\r
+ (*formatted)[j] = _T('\r');\r
+ (*formatted)[++j] = _T('\n');\r
+ }\r
+ }\r
+ j++;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
+/* Strip CR and replace LF with NULL. */\r
+int unformat_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **unformatted, unsigned long *newlen) {\r
+ unsigned long i, j;\r
+ *newlen = 0;\r
+\r
+ if (! dnlen) {\r
+ *unformatted = 0;\r
+ return 0;\r
+ }\r
+\r
+ for (i = 0; i < dnlen; i++) if (dn[i] != _T('\r')) ++*newlen;\r
+\r
+ /* Skip blank lines. */\r
+ for (i = 0; i < dnlen; i++) {\r
+ if (dn[i] == _T('\r') && dn[i + 1] == _T('\n')) {\r
+ /* This is the last CRLF. */\r
+ if (i >= dnlen - 2) break;\r
+\r
+ /*\r
+ Strip at the start of the block or if the next characters are\r
+ CRLF too.\r
+ */\r
+ if (! i || (dn[i + 2] == _T('\r') && dn[i + 3] == _T('\n'))) {\r
+ for (j = i + 2; j < dnlen; j++) dn[j - 2] = dn[j];\r
+ dn[dnlen--] = _T('\0');\r
+ dn[dnlen--] = _T('\0');\r
+ i--;\r
+ --*newlen;\r
+ }\r
+ }\r
+ }\r
+\r
+ /* Must end with two NULLs. */\r
+ *newlen += 2;\r
+\r
+ *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
+ if (! *unformatted) return 1;\r
+\r
+ for (i = 0, j = 0; i < dnlen; i++) {\r
+ if (dn[i] == _T('\r')) continue;\r
+ if (dn[i] == _T('\n')) (*unformatted)[j] = _T('\0');\r
+ else (*unformatted)[j] = dn[i];\r
+ j++;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned long *buffer, unsigned long default_value, unsigned long event) {\r
unsigned long type = REG_DWORD;\r
unsigned long buflen = sizeof(unsigned long);\r
\r
int get_io_parameters(nssm_service_t *service, HKEY key) {\r
/* stdin */\r
- if (get_createfile_parameters(key, NSSM_REG_STDIN, service->stdin_path, &service->stdin_sharing, NSSM_STDIN_SHARING, &service->stdin_disposition, NSSM_STDIN_DISPOSITION, &service->stdin_flags, NSSM_STDIN_FLAGS)) {\r
+ if (get_createfile_parameters(key, NSSM_REG_STDIN, service->stdin_path, &service->stdin_sharing, NSSM_STDIN_SHARING, &service->stdin_disposition, NSSM_STDIN_DISPOSITION, &service->stdin_flags, NSSM_STDIN_FLAGS, 0)) {\r
service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;\r
ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));\r
return 1;\r
}\r
\r
/* stdout */\r
- if (get_createfile_parameters(key, NSSM_REG_STDOUT, service->stdout_path, &service->stdout_sharing, NSSM_STDOUT_SHARING, &service->stdout_disposition, NSSM_STDOUT_DISPOSITION, &service->stdout_flags, NSSM_STDOUT_FLAGS)) {\r
+ if (get_createfile_parameters(key, NSSM_REG_STDOUT, service->stdout_path, &service->stdout_sharing, NSSM_STDOUT_SHARING, &service->stdout_disposition, NSSM_STDOUT_DISPOSITION, &service->stdout_flags, NSSM_STDOUT_FLAGS, &service->stdout_copy_and_truncate)) {\r
service->stdout_sharing = service->stdout_disposition = service->stdout_flags = 0;\r
ZeroMemory(service->stdout_path, _countof(service->stdout_path) * sizeof(TCHAR));\r
return 2;\r
}\r
\r
/* stderr */\r
- if (get_createfile_parameters(key, NSSM_REG_STDERR, service->stderr_path, &service->stderr_sharing, NSSM_STDERR_SHARING, &service->stderr_disposition, NSSM_STDERR_DISPOSITION, &service->stderr_flags, NSSM_STDERR_FLAGS)) {\r
+ if (get_createfile_parameters(key, NSSM_REG_STDERR, service->stderr_path, &service->stderr_sharing, NSSM_STDERR_SHARING, &service->stderr_disposition, NSSM_STDERR_DISPOSITION, &service->stderr_flags, NSSM_STDERR_FLAGS, &service->stderr_copy_and_truncate)) {\r
service->stderr_sharing = service->stderr_disposition = service->stderr_flags = 0;\r
ZeroMemory(service->stderr_path, _countof(service->stderr_path) * sizeof(TCHAR));\r
return 3;\r
HKEY key = open_registry(service->name, KEY_READ);\r
if (! key) return 1;\r
\r
+ /* Don't expand parameters when retrieving for the GUI. */\r
+ bool expand = si ? true : false;\r
+\r
/* Try to get executable file - MUST succeed */\r
- if (expand_parameter(key, NSSM_REG_EXE, service->exe, sizeof(service->exe), false)) {\r
+ if (get_string(key, NSSM_REG_EXE, service->exe, sizeof(service->exe), expand, false, true)) {\r
RegCloseKey(key);\r
return 3;\r
}\r
\r
/* Try to get flags - may fail and we don't care */\r
- if (expand_parameter(key, NSSM_REG_FLAGS, service->flags, sizeof(service->flags), false)) {\r
+ if (get_string(key, NSSM_REG_FLAGS, service->flags, sizeof(service->flags), expand, false, true)) {\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_FLAGS, NSSM_REG_FLAGS, service->name, service->exe, 0);\r
ZeroMemory(service->flags, sizeof(service->flags));\r
}\r
\r
/* Try to get startup directory - may fail and we fall back to a default */\r
- if (expand_parameter(key, NSSM_REG_DIR, service->dir, sizeof(service->dir), true) || ! service->dir[0]) {\r
+ if (get_string(key, NSSM_REG_DIR, service->dir, sizeof(service->dir), expand, true, true) || ! service->dir[0]) {\r
_sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);\r
strip_basename(service->dir);\r
if (service->dir[0] == _T('\0')) {\r
\r
/* Try to get processor affinity - may fail. */\r
TCHAR buffer[512];\r
- if (expand_parameter(key, NSSM_REG_AFFINITY, buffer, sizeof(buffer), false, false) || ! buffer[0]) service->affinity = 0LL;\r
+ if (get_string(key, NSSM_REG_AFFINITY, buffer, sizeof(buffer), false, false, false) || ! buffer[0]) service->affinity = 0LL;\r
else if (affinity_string_to_mask(buffer, &service->affinity)) {\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_AFFINITY_MASK, service->name, buffer);\r
service->affinity = 0LL;\r
if (get_number(key, NSSM_REG_ROTATE_SECONDS, &service->rotate_seconds, false) != 1) service->rotate_seconds = 0;\r
if (get_number(key, NSSM_REG_ROTATE_BYTES_LOW, &service->rotate_bytes_low, false) != 1) service->rotate_bytes_low = 0;\r
if (get_number(key, NSSM_REG_ROTATE_BYTES_HIGH, &service->rotate_bytes_high, false) != 1) service->rotate_bytes_high = 0;\r
+ override_milliseconds(service->name, key, NSSM_REG_ROTATE_DELAY, &service->rotate_delay, NSSM_ROTATE_DELAY, NSSM_EVENT_BOGUS_THROTTLE);\r
\r
/* Try to get force new console setting - may fail. */\r
if (get_number(key, NSSM_REG_NO_CONSOLE, &service->no_console, false) != 1) service->no_console = 0;\r
override_milliseconds(service->name, key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, &service->kill_window_delay, NSSM_KILL_WINDOW_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_WINDOW_GRACE_PERIOD);\r
override_milliseconds(service->name, key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, &service->kill_threads_delay, NSSM_KILL_THREADS_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_THREADS_GRACE_PERIOD);\r
\r
+ /* Try to get process tree settings - may fail. */\r
+ unsigned long kill_process_tree;\r
+ if (get_number(key, NSSM_REG_KILL_PROCESS_TREE, &kill_process_tree, false) == 1) {\r
+ if (kill_process_tree) service->kill_process_tree = true;\r
+ else service->kill_process_tree = false;\r
+ }\r
+ else service->kill_process_tree = true;\r
+\r
/* Try to get default exit action. */\r
bool default_action;\r
service->default_exit_action = NSSM_EXIT_RESTART;\r
git://git.iain.cx/iain / nssm.git / blobdiff