return 0;\r
}\r
\r
-int create_parameters(nssm_service_t *service) {\r
+int create_parameters(nssm_service_t *service, bool editing) {\r
/* Get registry */\r
TCHAR registry[KEY_LENGTH];\r
if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {\r
/* Other non-default parameters. May fail. */\r
unsigned long stop_method_skip = ~service->stop_method;\r
if (stop_method_skip) set_number(key, NSSM_REG_STOP_METHOD_SKIP, stop_method_skip);\r
- if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action]);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_STOP_METHOD_SKIP);\r
+ if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action], editing);\r
if (service->throttle_delay != NSSM_RESET_THROTTLE_RESTART) set_number(key, NSSM_REG_THROTTLE, service->throttle_delay);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_THROTTLE);\r
if (service->kill_console_delay != NSSM_KILL_CONSOLE_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, service->kill_console_delay);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD);\r
if (service->kill_window_delay != NSSM_KILL_WINDOW_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, service->kill_window_delay);\r
+ 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
- if (service->stdin_path[0]) {\r
- set_expand_string(key, NSSM_REG_STDIN, service->stdin_path);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD);\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
if (service->stdin_sharing != NSSM_STDIN_SHARING) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING, service->stdin_sharing);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING);\r
if (service->stdin_disposition != NSSM_STDIN_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION, service->stdin_disposition);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION);\r
if (service->stdin_flags != NSSM_STDIN_FLAGS) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS, service->stdin_flags);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS);\r
}\r
- if (service->stdout_path[0]) {\r
- set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);\r
+ if (service->stdout_path[0] || editing) {\r
+ if (service->stdout_path[0]) set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_STDOUT);\r
if (service->stdout_sharing != NSSM_STDOUT_SHARING) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING, service->stdout_sharing);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING);\r
if (service->stdout_disposition != NSSM_STDOUT_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION, service->stdout_disposition);\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
}\r
- if (service->stderr_path[0]) {\r
- set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);\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) RegDeleteValue(key, NSSM_REG_STDERR);\r
if (service->stderr_sharing != NSSM_STDERR_SHARING) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING, service->stderr_sharing);\r
+ else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING);\r
if (service->stderr_disposition != NSSM_STDERR_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION, service->stderr_disposition);\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
}\r
+ if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE);\r
+ if (service->rotate_seconds) set_number(key, NSSM_REG_ROTATE_SECONDS, service->rotate_seconds);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_SECONDS);\r
+ if (service->rotate_bytes_low) set_number(key, NSSM_REG_ROTATE_BYTES_LOW, service->rotate_bytes_low);\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
\r
/* Environment */\r
if (service->env) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
}\r
}\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_ENV);\r
if (service->env_extra) {\r
if (RegSetValueEx(key, NSSM_REG_ENV_EXTRA, 0, REG_MULTI_SZ, (const unsigned char *) service->env_extra, (unsigned long) service->env_extralen * sizeof(TCHAR)) != ERROR_SUCCESS) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV_EXTRA, error_string(GetLastError()), 0);\r
}\r
}\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_ENV_EXTRA);\r
\r
/* Close registry. */\r
RegCloseKey(key);\r
return 0;\r
}\r
\r
-int create_exit_action(TCHAR *service_name, const TCHAR *action_string) {\r
+int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool editing) {\r
/* Get registry */\r
TCHAR registry[KEY_LENGTH];\r
if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, NSSM_REG_EXIT) < 0) {\r
}\r
\r
/* Do nothing if the key already existed */\r
- if (disposition == REG_OPENED_EXISTING_KEY) {\r
+ if (disposition == REG_OPENED_EXISTING_KEY && ! editing) {\r
RegCloseKey(key);\r
return 0;\r
}\r
/* Dummy test to find buffer size */\r
unsigned long ret = RegQueryValueEx(key, value, 0, &type, NULL, envlen);\r
if (ret != ERROR_SUCCESS) {\r
+ *env = 0;\r
*envlen = 0;\r
/* The service probably doesn't have any environment configured */\r
if (ret == ERROR_FILE_NOT_FOUND) return 0;\r
}\r
\r
if (type != REG_MULTI_SZ) {\r
+ *env = 0;\r
+ *envlen = 0;\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, value, service_name, 0);\r
return 2;\r
}\r
\r
*env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);\r
if (! *env) {\r
+ *envlen = 0;\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("set_environment()"), 0);\r
return 3;\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
/* Environment variables to add to existing rather than replace - may fail. */\r
set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
\r
- if (service->env_extra) {\r
- /* Append these to any other environment variables set. */\r
- if (service->env) {\r
- /* Append extra variables to configured variables. */\r
- unsigned long envlen = service->envlen + service->env_extralen - 1;\r
- TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
- if (env) {\r
- memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
- /* envlen is in bytes. */\r
- memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
-\r
- HeapFree(GetProcessHeap(), 0, service->env);\r
- service->env = env;\r
- service->envlen = envlen;\r
+ if (si) {\r
+ if (service->env_extra) {\r
+ /* Append these to any other environment variables set. */\r
+ if (service->env) {\r
+ /* Append extra variables to configured variables. */\r
+ unsigned long envlen = service->envlen + service->env_extralen - 1;\r
+ TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
+ if (env) {\r
+ memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
+ /* envlen is in bytes. */\r
+ memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
+\r
+ HeapFree(GetProcessHeap(), 0, service->env);\r
+ service->env = env;\r
+ service->envlen = envlen;\r
+ }\r
+ else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
}\r
- else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
- }\r
- else {\r
- /* Append extra variables to our environment. */\r
- TCHAR *env, *s;\r
- size_t envlen, len;\r
-\r
- env = service->env_extra;\r
- len = 0;\r
- while (*env) {\r
- envlen = _tcslen(env) + 1;\r
- for (s = env; *s && *s != _T('='); s++);\r
- if (*s == _T('=')) *s++ = _T('\0');\r
- if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()));\r
- env += envlen;\r
+ else {\r
+ /* Append extra variables to our environment. */\r
+ TCHAR *env, *s;\r
+ size_t envlen, len;\r
+\r
+ env = service->env_extra;\r
+ len = 0;\r
+ while (*env) {\r
+ envlen = _tcslen(env) + 1;\r
+ for (s = env; *s && *s != _T('='); s++);\r
+ if (*s == _T('=')) *s++ = _T('\0');\r
+ if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()), 0);\r
+ env += envlen;\r
+ }\r
}\r
}\r
}\r
\r
+ /* Try to get file rotation settings - may fail. */\r
+ unsigned long rotate_files;\r
+ if (get_number(key, NSSM_REG_ROTATE, &rotate_files, false) == 1) {\r
+ if (rotate_files) service->rotate_files = true;\r
+ else service->rotate_files = false;\r
+ }\r
+ else service->rotate_files = false;\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
+\r
/* Change to startup directory in case stdout/stderr are relative paths. */\r
TCHAR cwd[MAX_PATH];\r
GetCurrentDirectory(_countof(cwd), cwd);\r
SetCurrentDirectory(service->dir);\r
\r
/* Try to get stdout and stderr */\r
- if (get_output_handles(key, si)) {\r
+ if (get_output_handles(service, key, si)) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service->name, 0);\r
RegCloseKey(key);\r
SetCurrentDirectory(cwd);\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 default exit action. */\r
+ bool default_action;\r
+ service->default_exit_action = NSSM_EXIT_RESTART;\r
+ TCHAR action_string[ACTION_LEN];\r
+ if (! get_exit_action(service->name, 0, action_string, &default_action)) {\r
+ for (int i = 0; exit_action_strings[i]; i++) {\r
+ if (! _tcsnicmp((const TCHAR *) action_string, exit_action_strings[i], ACTION_LEN)) {\r
+ service->default_exit_action = i;\r
+ break;\r
+ }\r
+ }\r
+ }\r
+\r
/* Close registry */\r
RegCloseKey(key);\r
\r
git://git.iain.cx/iain / nssm.git / blobdiff