Force UTF-16 output.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index cc871b7..caa0fb1 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -51,10 +51,26 @@ int create_parameters(nssm_service_t *service, bool editing) {
   }\r
 \r
   /* Other non-default parameters. May fail. */\r
+  if (service->priority != NORMAL_PRIORITY_CLASS) set_number(key, NSSM_REG_PRIORITY, service->priority);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_PRIORITY);\r
+  if (service->affinity) {\r
+    TCHAR *string;\r
+    if (! affinity_mask_to_string(service->affinity, &string)) {\r
+      if (RegSetValueEx(key, NSSM_REG_AFFINITY, 0, REG_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) != ERROR_SUCCESS) {\r
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_AFFINITY, error_string(GetLastError()), 0);\r
+        HeapFree(GetProcessHeap(), 0, string);\r
+        return 5;\r
+      }\r
+    }\r
+    if (string) HeapFree(GetProcessHeap(), 0, string);\r
+  }\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_AFFINITY);\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
   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
@@ -451,6 +467,32 @@ 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);\r
   }\r
 \r
+  /* Try to get processor affinity - may fail. */\r
+  TCHAR buffer[512];\r
+  if (expand_parameter(key, NSSM_REG_AFFINITY, buffer, sizeof(buffer), false, false) || ! buffer[0]) service->affinity = 0LL;\r
+  else if (affinity_string_to_mask(buffer, &service->affinity)) {\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_AFFINITY_MASK, service->name, buffer);\r
+    service->affinity = 0LL;\r
+  }\r
+  else {\r
+    DWORD_PTR affinity, system_affinity;\r
+\r
+    if (GetProcessAffinityMask(GetCurrentProcess(), &affinity, &system_affinity)) {\r
+      _int64 effective_affinity = service->affinity & system_affinity;\r
+      if (effective_affinity != service->affinity) {\r
+        TCHAR *system = 0;\r
+        if (! affinity_mask_to_string(system_affinity, &system)) {\r
+          TCHAR *effective = 0;\r
+          if (! affinity_mask_to_string(effective_affinity, &effective)) {\r
+            log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_EFFECTIVE_AFFINITY_MASK, service->name, buffer, system, effective, 0);\r
+          }\r
+          HeapFree(GetProcessHeap(), 0, effective);\r
+        }\r
+        HeapFree(GetProcessHeap(), 0, system);\r
+      }\r
+    }\r
+  }\r
+\r
   /* Try to get environment variables - may fail */\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
@@ -492,6 +534,13 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     }\r
   }\r
 \r
+  /* Try to get priority - may fail. */\r
+  unsigned long priority;\r
+  if (get_number(key, NSSM_REG_PRIORITY, &priority, false) == 1) {\r
+    if (priority == (priority & priority_mask())) service->priority = priority;\r
+    else log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_PRIORITY, service->name, NSSM_REG_PRIORITY, 0);\r
+  }\r
+\r
   /* Try to get file rotation settings - may fail. */\r
   unsigned long rotate_files;\r
   if (get_number(key, NSSM_REG_ROTATE, &rotate_files, false) == 1) {\r
@@ -519,6 +568,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   /* 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