X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=d20b2c283089b4fe467f12feff862b445731fc61;hb=caaaa1208f29647987173f7d9bc1aa75b58757b7;hp=e3817a4bc1560c55c851fbe9a655039e1713c5cf;hpb=e26682667e15433cad518e622c3c061840b487dd;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index e3817a4..d20b2c2 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -158,6 +158,8 @@ int create_parameters(nssm_service_t *service, bool editing) {
     if (service->stderr_copy_and_truncate) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_COPY_AND_TRUNCATE, 1);
     else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_COPY_AND_TRUNCATE);
   }
+  if (service->hook_share_output_handles) set_number(key, NSSM_REG_HOOK_SHARE_OUTPUT_HANDLES, 1);
+  else if (editing) RegDeleteValue(key, NSSM_REG_HOOK_SHARE_OUTPUT_HANDLES);
   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);
@@ -353,12 +355,10 @@ int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {
 
 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;
 }
 
 /*
@@ -524,7 +524,7 @@ long open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, HKEY
 
 HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool must_exist) {
   HKEY key;
-  long error = open_registry(service_name, sub, sam, &key, true);
+  long error = open_registry(service_name, sub, sam, &key, must_exist);
   return key;
 }
 
@@ -640,6 +640,13 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     else log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_PRIORITY, service->name, NSSM_REG_PRIORITY, 0);
   }
 
+  /* Try to get hook I/O sharing - may fail. */
+  unsigned long hook_share_output_handles;
+  if (get_number(key, NSSM_REG_HOOK_SHARE_OUTPUT_HANDLES, &hook_share_output_handles, false) == 1) {
+    if (hook_share_output_handles) service->hook_share_output_handles = true;
+    else service->hook_share_output_handles = false;
+  }
+  else hook_share_output_handles = false;
   /* Try to get file rotation settings - may fail. */
   unsigned long rotate_files;
   if (get_number(key, NSSM_REG_ROTATE, &rotate_files, false) == 1) {
@@ -652,6 +659,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     else service->rotate_stdout_online = service->rotate_stderr_online = false;
   }
   else service->rotate_stdout_online = service->rotate_stderr_online = false;
+  /* Hook I/O sharing and online rotation need a pipe. */
+  service->use_stdout_pipe = service->rotate_stdout_online || hook_share_output_handles;
+  service->use_stderr_pipe = service->rotate_stderr_online || hook_share_output_handles;
   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;
@@ -822,8 +832,15 @@ int get_hook(const TCHAR *service_name, const TCHAR *hook_event, const TCHAR *ho
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("hook registry"), _T("get_hook()"), 0);
     return 1;
   }
-  HKEY key = open_registry(service_name, registry, KEY_READ, false);
-  if (! key) return 1;
+  HKEY key;
+  long error = open_registry(service_name, registry, KEY_READ, &key, false);
+  if (! key) {
+    if (error == ERROR_FILE_NOT_FOUND) {
+      ZeroMemory(buffer, buflen);
+      return 0;
+    }
+    return 1;
+  }
 
   int ret = expand_parameter(key, (TCHAR *) hook_action, buffer, buflen, true, false);