X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=5172c50e91750fc26d66a5c201a785102281f8a4;hb=55f0212c538955a0c812aa3a6ddb367b292189e4;hp=15ee152a5483564a0678c052b406637409cdedc3;hpb=e9d9b2fa71473e96650fe3fc4ee0d5535c6725d8;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index 15ee152..5172c50 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -102,6 +102,45 @@ int create_exit_action(char *service_name, const char *action_string) {
   return 0;
 }
 
+int set_environment(char *service_name, HKEY key, char **env) {
+  unsigned long type = REG_MULTI_SZ;
+  unsigned long envlen = 0;
+
+  /* Dummy test to find buffer size */
+  unsigned long ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, NULL, &envlen);
+  if (ret != ERROR_SUCCESS) {
+    /* The service probably doesn't have any environment configured */
+    if (ret == ERROR_FILE_NOT_FOUND) return 0;
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);
+    return 1;
+  }
+
+  if (type != REG_MULTI_SZ) {
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, NSSM_REG_ENV, service_name, 0);
+    return 2;
+  }
+
+  /* Probably not possible */
+  if (! envlen) return 0;
+
+  *env = (char *) HeapAlloc(GetProcessHeap(), 0, envlen);
+  if (! *env) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "environment registry", "set_environment()", 0);
+    return 3;
+  }
+
+  /* Actually get the strings */
+  ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, (unsigned char *) *env, &envlen);
+  if (ret != ERROR_SUCCESS) {
+    HeapFree(GetProcessHeap(), 0, *env);
+    *env = 0;
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);
+    return 4;
+  }
+
+  return 0;
+}
+
 int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {
   unsigned char *buffer = (unsigned char *) HeapAlloc(GetProcessHeap(), 0, datalen);
   if (! buffer) {
@@ -133,7 +172,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
 
   ret = ExpandEnvironmentStrings((char *) buffer, data, datalen);
   if (! ret || ret > datalen) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, value, buffer, error_string(GetLastError()), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, buffer, error_string(GetLastError()), 0);
     HeapFree(GetProcessHeap(), 0, buffer);
     return 3;
   }
@@ -142,7 +181,9 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
   return 0;
 }
 
-int get_parameters(char *service_name, char *exe, int exelen, char *flags, int flagslen, char *dir, int dirlen) {
+int get_parameters(char *service_name, char *exe, int exelen, char *flags, int flagslen, char *dir, int dirlen, char **env, unsigned long *throttle_delay) {
+  unsigned long ret;
+
   /* Get registry */
   char registry[KEY_LENGTH];
   if (_snprintf(registry, sizeof(registry), NSSM_REGISTRY, service_name) < 0) {
@@ -180,7 +221,7 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
     }
     else {
       /* Help! */
-      unsigned long ret = GetWindowsDirectory(dir, dirlen);
+      ret = GetWindowsDirectory(dir, dirlen);
       if (! ret || ret > dirlen) {
         log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_NO_DIR_AND_NO_FALLBACK, NSSM_REG_DIR, service_name, 0);
         RegCloseKey(key);
@@ -190,6 +231,28 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_DIR, NSSM_REG_DIR, service_name, dir, 0);
   }
 
+  /* Try to get environment variables - may fail */
+  set_environment(service_name, key, env);
+
+  /* Try to get throttle restart delay */
+  unsigned long type = REG_DWORD;
+  unsigned long buflen = sizeof(*throttle_delay);
+  bool throttle_ok = false;
+  ret = RegQueryValueEx(key, NSSM_REG_THROTTLE, 0, &type, (unsigned char *) throttle_delay, &buflen);
+  if (ret != ERROR_SUCCESS) {
+    if (ret != ERROR_FILE_NOT_FOUND) {
+      if (type != REG_DWORD) {
+        char milliseconds[16];
+        _snprintf(milliseconds, sizeof(milliseconds), "%lu", NSSM_RESET_THROTTLE_RESTART);
+        log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_THROTTLE, service_name, NSSM_REG_THROTTLE, milliseconds, 0);
+      }
+      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_THROTTLE, error_string(GetLastError()), 0);
+    }
+  }
+  else throttle_ok = true;
+
+  if (! throttle_ok) *throttle_delay = NSSM_RESET_THROTTLE_RESTART;
+
   /* Close registry */
   RegCloseKey(key);