}\r
\r
/* Get path of this program */\r
- TCHAR path[MAX_PATH];\r
+ TCHAR path[PATH_LENGTH];\r
GetModuleFileName(0, path, _countof(path));\r
\r
/* Try to register the module but don't worry so much on failure */\r
if (stop_method_skip) set_number(key, NSSM_REG_STOP_METHOD_SKIP, stop_method_skip);\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->restart_delay) set_number(key, NSSM_REG_RESTART_DELAY, service->restart_delay);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_RESTART_DELAY);\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
}\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_stdout_online) set_number(key, NSSM_REG_ROTATE_ONLINE, 1);\r
+ else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_ONLINE);\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
return 0;\r
}\r
\r
-int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool expand, bool sanitise, bool must_exist) {\r
TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
if (! buffer) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_string()"), 0);\r
return 1;\r
}\r
\r
/* Paths aren't allowed to contain quotes. */\r
if (sanitise) PathUnquoteSpaces(buffer);\r
\r
+ /* Do we want to expand the string? */\r
+ if (! expand) {\r
+ if (type == REG_EXPAND_SZ) type = REG_SZ;\r
+ }\r
+\r
/* Technically we shouldn't expand environment strings from REG_SZ values */\r
if (type != REG_EXPAND_SZ) {\r
memmove(data, buffer, buflen);\r
return 0;\r
}\r
\r
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {\r
+ return get_string(key, value, data, datalen, false, sanitise, true);\r
+}\r
+\r
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
+ return get_string(key, value, data, datalen, true, sanitise, must_exist);\r
+}\r
+\r
int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {\r
return expand_parameter(key, value, data, datalen, sanitise, true);\r
}\r
Returns: 0 if it was set.\r
1 on error.\r
*/\r
-int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
- if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;\r
+int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {\r
+ unsigned long type = expand ? REG_EXPAND_SZ : REG_SZ;\r
+ if (RegSetValueEx(key, value, 0, type, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);\r
return 1;\r
}\r
\r
+int set_string(HKEY key, TCHAR *value, TCHAR *string) {\r
+ return set_string(key, value, string, false);\r
+ return 1;\r
+}\r
+\r
+int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
+ return set_string(key, value, string, true);\r
+ return 1;\r
+}\r
+\r
/*\r
Set an unsigned long in the registry.\r
Returns: 0 if it was set.\r
\r
if (si) {\r
if (service->env_extra) {\r
- /* Append these to any other environment variables set. */\r
+ TCHAR *env;\r
+ unsigned long envlen;\r
+\r
+ /* Copy our environment for the application. */\r
+ if (! service->env) {\r
+ TCHAR *rawenv = GetEnvironmentStrings();\r
+ env = rawenv;\r
+ if (env) {\r
+ /*\r
+ The environment block starts with variables of the form\r
+ =C:=C:\Windows\System32 which we ignore.\r
+ */\r
+ while (*env == _T('=')) {\r
+ for ( ; *env; env++);\r
+ env++;\r
+ }\r
+ envlen = 0;\r
+ if (*env) {\r
+ while (true) {\r
+ for ( ; env[envlen]; envlen++);\r
+ if (! env[++envlen]) break;\r
+ }\r
+ envlen++;\r
+\r
+ service->envlen = envlen * sizeof(TCHAR);\r
+ service->env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, service->envlen);\r
+ memmove(service->env, env, service->envlen);\r
+ FreeEnvironmentStrings(rawenv);\r
+ }\r
+ }\r
+ }\r
+\r
+ /* Append extra variables to configured variables. */\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
+ envlen = service->envlen + service->env_extralen - sizeof(TCHAR)/*?*/;\r
+ env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
if (env) {\r
memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
- /* envlen is in bytes. */\r
+ /* envlen is in bytes but env[i] is in characters. */\r
memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
\r
HeapFree(GetProcessHeap(), 0, service->env);\r
+ HeapFree(GetProcessHeap(), 0, service->env_extra);\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 {\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
+ /* Huh? No environment at all? */\r
+ service->env = service->env_extra;\r
+ service->envlen = service->env_extralen;\r
}\r
}\r
+\r
+ service->env_extra = 0;\r
+ service->env_extralen = 0;\r
}\r
\r
/* Try to get priority - may fail. */\r
else service->rotate_files = false;\r
}\r
else service->rotate_files = false;\r
+ if (get_number(key, NSSM_REG_ROTATE_ONLINE, &rotate_files, false) == 1) {\r
+ if (rotate_files) service->rotate_stdout_online = service->rotate_stderr_online = true;\r
+ else service->rotate_stdout_online = service->rotate_stderr_online = false;\r
+ }\r
+ else service->rotate_stdout_online = service->rotate_stderr_online = 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
+ TCHAR cwd[PATH_LENGTH];\r
GetCurrentDirectory(_countof(cwd), cwd);\r
SetCurrentDirectory(service->dir);\r
\r
/* Change back in case the startup directory needs to be deleted. */\r
SetCurrentDirectory(cwd);\r
\r
+ /* Try to get mandatory restart delay */\r
+ override_milliseconds(service->name, key, NSSM_REG_RESTART_DELAY, &service->restart_delay, 0, NSSM_EVENT_BOGUS_RESTART_DELAY);\r
+\r
/* Try to get throttle restart delay */\r
override_milliseconds(service->name, key, NSSM_REG_THROTTLE, &service->throttle_delay, NSSM_RESET_THROTTLE_RESTART, NSSM_EVENT_BOGUS_THROTTLE);\r
\r
git://git.iain.cx/iain / nssm.git / blobdiff