Moved console functions to a new file.

[nssm.git] / settings.cpp

diff --git a/settings.cpp b/settings.cpp
index 3943220..73b8d0d 100644 (file)
--- a/settings.cpp
+++ b/settings.cpp
@@ -101,7 +101,7 @@ static int setting_get_string(const TCHAR *service_name, void *param, const TCHA
   HKEY key = (HKEY) param;
   TCHAR buffer[VALUE_LENGTH];
 
-  if (expand_parameter(key, (TCHAR *) name, (TCHAR *) buffer, (unsigned long) sizeof(buffer), false, false)) return -1;
+  if (get_string(key, (TCHAR *) name, (TCHAR *) buffer, (unsigned long) sizeof(buffer), false, false, false)) return -1;
 
   return value_from_string(name, value, buffer);
 }
@@ -266,7 +266,7 @@ static int setting_get_affinity(const TCHAR *service_name, void *param, const TC
     return -1;
   }
 
-  if (expand_parameter(key, (TCHAR *) name, buffer, buflen, false, true)) {
+  if (get_string(key, (TCHAR *) name, buffer, buflen, false, false, true)) {
     HeapFree(GetProcessHeap(), 0, buffer);
     return -1;
   }
@@ -329,7 +329,7 @@ static int setting_get_environment(const TCHAR *service_name, void *param, const
 
   TCHAR *env = 0;
   unsigned long envlen;
-  if (set_environment((TCHAR *) service_name, key, (TCHAR *) name, &env, &envlen)) return -1;
+  if (get_environment((TCHAR *) service_name, key, (TCHAR *) name, &env, &envlen)) return -1;
   if (! envlen) return 0;
 
   TCHAR *formatted;
@@ -810,6 +810,7 @@ settings_t settings[] = {
   { NSSM_REG_AFFINITY, REG_SZ, 0, false, 0, setting_set_affinity, setting_get_affinity },
   { NSSM_REG_ENV, REG_MULTI_SZ, NULL, false, ADDITIONAL_CRLF, setting_set_environment, setting_get_environment },
   { NSSM_REG_ENV_EXTRA, REG_MULTI_SZ, NULL, false, ADDITIONAL_CRLF, setting_set_environment, setting_get_environment },
+  { NSSM_REG_NO_CONSOLE, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_PRIORITY, REG_SZ, (void *) priority_strings[NSSM_NORMAL_PRIORITY], false, 0, setting_set_priority, setting_get_priority },
   { NSSM_REG_RESTART_DELAY, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_STDIN, REG_EXPAND_SZ, NULL, false, 0, setting_set_string, setting_get_string },
@@ -830,6 +831,7 @@ settings_t settings[] = {
   { NSSM_REG_KILL_THREADS_GRACE_PERIOD, REG_DWORD, (void *) NSSM_KILL_THREADS_GRACE_PERIOD, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_THROTTLE, REG_DWORD, (void *) NSSM_RESET_THROTTLE_RESTART, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
+  { NSSM_REG_ROTATE_ONLINE, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_SECONDS, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_BYTES_LOW, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_BYTES_HIGH, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },