X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=bd79dc3da435b3042e6fe269352443ff51b8bffa;hb=eac4d7eedfe338703f0103aac01af2ca306f615a;hp=c93d3ae1659c83dde348ba6a1c0e5bffb78ac12c;hpb=02203cb8aff4be6a094b7a9ded867c3b5d743d77;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index c93d3ae..bd79dc3 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -17,7 +17,7 @@ int create_messages() {
   }
 
   /* Get path of this program */
-  TCHAR path[MAX_PATH];
+  TCHAR path[PATH_LENGTH];
   GetModuleFileName(0, path, _countof(path));
 
   /* Try to register the module but don't worry so much on failure */
@@ -53,10 +53,24 @@ int create_parameters(nssm_service_t *service, bool editing) {
   /* Other non-default parameters. May fail. */
   if (service->priority != NORMAL_PRIORITY_CLASS) set_number(key, NSSM_REG_PRIORITY, service->priority);
   else if (editing) RegDeleteValue(key, NSSM_REG_PRIORITY);
+  if (service->affinity) {
+    TCHAR *string;
+    if (! affinity_mask_to_string(service->affinity, &string)) {
+      if (RegSetValueEx(key, NSSM_REG_AFFINITY, 0, REG_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) != ERROR_SUCCESS) {
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_AFFINITY, error_string(GetLastError()), 0);
+        HeapFree(GetProcessHeap(), 0, string);
+        return 5;
+      }
+    }
+    if (string) HeapFree(GetProcessHeap(), 0, string);
+  }
+  else if (editing) RegDeleteValue(key, NSSM_REG_AFFINITY);
   unsigned long stop_method_skip = ~service->stop_method;
   if (stop_method_skip) set_number(key, NSSM_REG_STOP_METHOD_SKIP, stop_method_skip);
   else if (editing) RegDeleteValue(key, NSSM_REG_STOP_METHOD_SKIP);
   if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action], editing);
+  if (service->restart_delay) set_number(key, NSSM_REG_RESTART_DELAY, service->restart_delay);
+  else if (editing) RegDeleteValue(key, NSSM_REG_RESTART_DELAY);
   if (service->throttle_delay != NSSM_RESET_THROTTLE_RESTART) set_number(key, NSSM_REG_THROTTLE, service->throttle_delay);
   else if (editing) RegDeleteValue(key, NSSM_REG_THROTTLE);
   if (service->kill_console_delay != NSSM_KILL_CONSOLE_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, service->kill_console_delay);
@@ -97,6 +111,8 @@ int create_parameters(nssm_service_t *service, bool editing) {
   }
   if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);
   else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE);
+  if (service->rotate_stdout_online) set_number(key, NSSM_REG_ROTATE_ONLINE, 1);
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_ONLINE);
   if (service->rotate_seconds) set_number(key, NSSM_REG_ROTATE_SECONDS, service->rotate_seconds);
   else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_SECONDS);
   if (service->rotate_bytes_low) set_number(key, NSSM_REG_ROTATE_BYTES_LOW, service->rotate_bytes_low);
@@ -159,7 +175,7 @@ int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool edi
   return 0;
 }
 
-int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {
+int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {
   unsigned long type = REG_MULTI_SZ;
 
   /* Dummy test to find buffer size */
@@ -189,7 +205,7 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);
   if (! *env) {
     *envlen = 0;
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("set_environment()"), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_environment()"), 0);
     return 3;
   }
 
@@ -206,69 +222,11 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   return 0;
 }
 
-/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */
-int format_environment(TCHAR *env, unsigned long envlen, TCHAR **formatted, unsigned long *newlen) {
-  unsigned long i, j;
-  *newlen = envlen;
-
-  if (! *newlen) {
-    *formatted = 0;
-    return 0;
-  }
-
-  for (i = 0; i < envlen; i++) if (! env[i] && env[i + 1]) ++*newlen;
-
-  *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
-  if (! *formatted) {
-    *newlen = 0;
-    return 1;
-  }
-
-  for (i = 0, j = 0; i < envlen; i++) {
-    (*formatted)[j] = env[i];
-    if (! env[i]) {
-      if (env[i + 1]) {
-        (*formatted)[j] = _T('\r');
-        (*formatted)[++j] = _T('\n');
-      }
-    }
-    j++;
-  }
-
-  return 0;
-}
-
-/* Strip CR and replace LF with NULL. */
-int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted, unsigned long *newlen) {
-  unsigned long i, j;
-  *newlen = 0;
-
-  if (! envlen) {
-    *unformatted = 0;
-    return 0;
-  }
-
-  for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) ++*newlen;
-  /* Must end with two NULLs. */
-  *newlen += 2;
-
-  *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
-  if (! *unformatted) return 1;
-
-  for (i = 0, j = 0; i < envlen; i++) {
-    if (env[i] == _T('\r')) continue;
-    if (env[i] == _T('\n')) (*unformatted)[j] = _T('\0');
-    else (*unformatted)[j] = env[i];
-    j++;
-  }
-
-  return 0;
-}
 
-int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool expand, bool sanitise, bool must_exist) {
   TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);
   if (! buffer) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_string()"), 0);
     return 1;
   }
 
@@ -293,6 +251,11 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   /* Paths aren't allowed to contain quotes. */
   if (sanitise) PathUnquoteSpaces(buffer);
 
+  /* Do we want to expand the string? */
+  if (! expand) {
+    if (type == REG_EXPAND_SZ) type = REG_SZ;
+  }
+
   /* Technically we shouldn't expand environment strings from REG_SZ values */
   if (type != REG_EXPAND_SZ) {
     memmove(data, buffer, buflen);
@@ -311,6 +274,14 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   return 0;
 }
 
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {
+  return get_string(key, value, data, datalen, false, sanitise, true);
+}
+
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {
+  return get_string(key, value, data, datalen, true, sanitise, must_exist);
+}
+
 int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {
   return expand_parameter(key, value, data, datalen, sanitise, true);
 }
@@ -320,12 +291,23 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   Returns: 0 if it was set.
            1 on error.
 */
-int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {
-  if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;
+int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {
+  unsigned long type = expand ? REG_EXPAND_SZ : REG_SZ;
+  if (RegSetValueEx(key, value, 0, type, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;
   log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);
   return 1;
 }
 
+int set_string(HKEY key, TCHAR *value, TCHAR *string) {
+  return set_string(key, value, string, false);
+  return 1;
+}
+
+int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {
+  return set_string(key, value, string, true);
+  return 1;
+}
+
 /*
   Set an unsigned long in the registry.
   Returns: 0 if it was set.
@@ -453,50 +435,40 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_DIR, NSSM_REG_DIR, service->name, service->dir, 0);
   }
 
-  /* Try to get environment variables - may fail */
-  set_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);
-  /* Environment variables to add to existing rather than replace - may fail. */
-  set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);
-
-  if (si) {
-    if (service->env_extra) {
-      /* Append these to any other environment variables set. */
-      if (service->env) {
-        /* Append extra variables to configured variables. */
-        unsigned long envlen = service->envlen + service->env_extralen - 1;
-        TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);
-        if (env) {
-          memmove(env, service->env, service->envlen - sizeof(TCHAR));
-          /* envlen is in bytes. */
-          memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);
-
-          HeapFree(GetProcessHeap(), 0, service->env);
-          service->env = env;
-          service->envlen = envlen;
-        }
-        else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);
-      }
-      else {
-        /* Append extra variables to our environment. */
-        TCHAR *env, *s;
-        size_t envlen, len;
-
-        env = service->env_extra;
-        len = 0;
-        while (*env) {
-          envlen = _tcslen(env) + 1;
-          for (s = env; *s && *s != _T('='); s++);
-          if (*s == _T('=')) *s++ = _T('\0');
-          if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()), 0);
-          env += envlen;
+  /* Try to get processor affinity - may fail. */
+  TCHAR buffer[512];
+  if (expand_parameter(key, NSSM_REG_AFFINITY, buffer, sizeof(buffer), false, false) || ! buffer[0]) service->affinity = 0LL;
+  else if (affinity_string_to_mask(buffer, &service->affinity)) {
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_AFFINITY_MASK, service->name, buffer);
+    service->affinity = 0LL;
+  }
+  else {
+    DWORD_PTR affinity, system_affinity;
+
+    if (GetProcessAffinityMask(GetCurrentProcess(), &affinity, &system_affinity)) {
+      _int64 effective_affinity = service->affinity & system_affinity;
+      if (effective_affinity != service->affinity) {
+        TCHAR *system = 0;
+        if (! affinity_mask_to_string(system_affinity, &system)) {
+          TCHAR *effective = 0;
+          if (! affinity_mask_to_string(effective_affinity, &effective)) {
+            log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_EFFECTIVE_AFFINITY_MASK, service->name, buffer, system, effective, 0);
+          }
+          HeapFree(GetProcessHeap(), 0, effective);
         }
+        HeapFree(GetProcessHeap(), 0, system);
       }
     }
   }
 
+  /* Try to get environment variables - may fail */
+  get_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);
+  /* Environment variables to add to existing rather than replace - may fail. */
+  get_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);
+
   /* Try to get priority - may fail. */
   unsigned long priority;
-  if (get_number(key, NSSM_REG_PRIORITY, &priority) == 1) {
+  if (get_number(key, NSSM_REG_PRIORITY, &priority, false) == 1) {
     if (priority == (priority & priority_mask())) service->priority = priority;
     else log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_PRIORITY, service->name, NSSM_REG_PRIORITY, 0);
   }
@@ -508,12 +480,17 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     else service->rotate_files = false;
   }
   else service->rotate_files = false;
+  if (get_number(key, NSSM_REG_ROTATE_ONLINE, &rotate_files, false) == 1) {
+    if (rotate_files) service->rotate_stdout_online = service->rotate_stderr_online = true;
+    else service->rotate_stdout_online = service->rotate_stderr_online = false;
+  }
+  else service->rotate_stdout_online = service->rotate_stderr_online = false;
   if (get_number(key, NSSM_REG_ROTATE_SECONDS, &service->rotate_seconds, false) != 1) service->rotate_seconds = 0;
   if (get_number(key, NSSM_REG_ROTATE_BYTES_LOW, &service->rotate_bytes_low, false) != 1) service->rotate_bytes_low = 0;
   if (get_number(key, NSSM_REG_ROTATE_BYTES_HIGH, &service->rotate_bytes_high, false) != 1) service->rotate_bytes_high = 0;
 
   /* Change to startup directory in case stdout/stderr are relative paths. */
-  TCHAR cwd[MAX_PATH];
+  TCHAR cwd[PATH_LENGTH];
   GetCurrentDirectory(_countof(cwd), cwd);
   SetCurrentDirectory(service->dir);
 
@@ -528,6 +505,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   /* Change back in case the startup directory needs to be deleted. */
   SetCurrentDirectory(cwd);
 
+  /* Try to get mandatory restart delay */
+  override_milliseconds(service->name, key, NSSM_REG_RESTART_DELAY, &service->restart_delay, 0, NSSM_EVENT_BOGUS_RESTART_DELAY);
+
   /* Try to get throttle restart delay */
   override_milliseconds(service->name, key, NSSM_REG_THROTTLE, &service->throttle_delay, NSSM_RESET_THROTTLE_RESTART, NSSM_EVENT_BOGUS_THROTTLE);