#include "nssm.h"\r
\r
+extern const char *exit_action_strings[];\r
+\r
int create_messages() {\r
HKEY key;\r
\r
/* Try to register the module but don't worry so much on failure */\r
RegSetValueEx(key, "EventMessageFile", 0, REG_SZ, (const unsigned char *) path, (unsigned long) strlen(path) + 1);\r
unsigned long types = EVENTLOG_INFORMATION_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_ERROR_TYPE;\r
- RegSetValueEx(key, "TypesSupported", 0, REG_DWORD, /*XXX*/(PBYTE) &types, sizeof(types));\r
+ RegSetValueEx(key, "TypesSupported", 0, REG_DWORD, (const unsigned char *) &types, sizeof(types));\r
\r
return 0;\r
}\r
}\r
\r
/* Try to create the parameters */\r
- if (RegSetValueEx(key, NSSM_REG_EXE, 0, REG_EXPAND_SZ, (const unsigned char *) service->exe, (unsigned long) strlen(service->exe) + 1) != ERROR_SUCCESS) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_EXE, error_string(GetLastError()), 0);\r
+ if (set_expand_string(key, NSSM_REG_EXE, service->exe)) {\r
RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
RegCloseKey(key);\r
return 3;\r
}\r
- if (RegSetValueEx(key, NSSM_REG_FLAGS, 0, REG_EXPAND_SZ, (const unsigned char *) service->flags, (unsigned long) strlen(service->flags) + 1) != ERROR_SUCCESS) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_FLAGS, error_string(GetLastError()), 0);\r
+ if (set_expand_string(key, NSSM_REG_FLAGS, service->flags)) {\r
RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
RegCloseKey(key);\r
return 4;\r
}\r
- if (RegSetValueEx(key, NSSM_REG_DIR, 0, REG_EXPAND_SZ, (const unsigned char *) service->dir, (unsigned long) strlen(service->dir) + 1) != ERROR_SUCCESS) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_DIR, error_string(GetLastError()), 0);\r
+ if (set_expand_string(key, NSSM_REG_DIR, service->dir)) {\r
RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
RegCloseKey(key);\r
return 5;\r
}\r
\r
- /* Close registry */\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
+ if (service->throttle_delay != NSSM_RESET_THROTTLE_RESTART) set_number(key, NSSM_REG_THROTTLE, service->throttle_delay);\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
+ if (service->kill_window_delay != NSSM_KILL_WINDOW_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, service->kill_window_delay);\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
+ if (service->stdin_sharing != NSSM_STDIN_SHARING) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING, service->stdin_sharing);\r
+ if (service->stdin_disposition != NSSM_STDIN_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION, service->stdin_disposition);\r
+ if (service->stdin_flags != NSSM_STDIN_FLAGS) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS, service->stdin_flags);\r
+ }\r
+ if (service->stdout_path[0]) {\r
+ set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);\r
+ if (service->stdout_sharing != NSSM_STDOUT_SHARING) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING, service->stdout_sharing);\r
+ if (service->stdout_disposition != NSSM_STDOUT_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION, service->stdout_disposition);\r
+ if (service->stdout_flags != NSSM_STDOUT_FLAGS) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS, service->stdout_flags);\r
+ }\r
+ if (service->stderr_path[0]) {\r
+ set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);\r
+ if (service->stderr_sharing != NSSM_STDERR_SHARING) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING, service->stderr_sharing);\r
+ if (service->stderr_disposition != NSSM_STDERR_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION, service->stderr_disposition);\r
+ if (service->stderr_flags != NSSM_STDERR_FLAGS) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS, service->stderr_flags);\r
+ }\r
+\r
+ /* Environment */\r
+ if (service->env) {\r
+ if (RegSetValueEx(key, NSSM_REG_ENV, 0, REG_MULTI_SZ, (const unsigned char *) service->env, (unsigned long) service->envlen) != ERROR_SUCCESS) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
+ }\r
+ }\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) != ERROR_SUCCESS) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV_EXTRA, error_string(GetLastError()), 0);\r
+ }\r
+ }\r
+\r
+ /* Close registry. */\r
RegCloseKey(key);\r
\r
return 0;\r
return 0;\r
}\r
\r
-int set_environment(char *service_name, HKEY key, char **env) {\r
+int set_environment(char *service_name, HKEY key, char *value, char **env, unsigned long *envlen) {\r
unsigned long type = REG_MULTI_SZ;\r
- unsigned long envlen = 0;\r
\r
/* Dummy test to find buffer size */\r
- unsigned long ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, NULL, &envlen);\r
+ unsigned long ret = RegQueryValueEx(key, value, 0, &type, NULL, envlen);\r
if (ret != ERROR_SUCCESS) {\r
+ *envlen = 0;\r
/* The service probably doesn't have any environment configured */\r
if (ret == ERROR_FILE_NOT_FOUND) return 0;\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
return 1;\r
}\r
\r
if (type != REG_MULTI_SZ) {\r
- log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, NSSM_REG_ENV, service_name, 0);\r
+ log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, value, service_name, 0);\r
return 2;\r
}\r
\r
/* Probably not possible */\r
- if (! envlen) return 0;\r
+ if (! *envlen) return 0;\r
\r
/* Previously initialised? */\r
if (*env) HeapFree(GetProcessHeap(), 0, *env);\r
\r
- *env = (char *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
+ *env = (char *) HeapAlloc(GetProcessHeap(), 0, *envlen);\r
if (! *env) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "environment registry", "set_environment()", 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, "set_environment()", 0);\r
return 3;\r
}\r
\r
/* Actually get the strings */\r
- ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, (unsigned char *) *env, &envlen);\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
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
+ *envlen = 0;\r
return 4;\r
}\r
\r
}\r
\r
/* Try to get environment variables - may fail */\r
- set_environment(service->name, key, &service->env);\r
+ set_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\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
+ char *env = (char *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
+ if (env) {\r
+ memmove(env, service->env, service->envlen - 1);\r
+ memmove(env + service->envlen - 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, "environment", "get_parameters()", 0);\r
+ }\r
+ else {\r
+ /* Append extra variables to our environment. */\r
+ char *env, *s;\r
+ size_t envlen, len;\r
+\r
+ env = service->env_extra;\r
+ len = 0;\r
+ while (*env) {\r
+ envlen = strlen(env) + 1;\r
+ for (s = env; *s && *s != '='; s++);\r
+ if (*s == '=') *s++ = '\0';\r
+ if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()));\r
+ env += envlen;\r
+ }\r
+ }\r
+ }\r
\r
/* Try to get stdout and stderr */\r
if (get_output_handles(key, si)) {\r
git://git.iain.cx/iain / nssm.git / blobdiff