Store I/O redirection and environment options.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index e192529..09ad1cb 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -86,6 +86,10 @@ int create_parameters(nssm_service_t *service) {
     if (service->stderr_disposition != NSSM_STDERR_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION, service->stderr_disposition);\r
     if (service->stderr_flags != NSSM_STDERR_FLAGS) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS, service->stderr_flags);\r
   }\r
+  if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);\r
+  if (service->rotate_seconds) set_number(key, NSSM_REG_ROTATE_SECONDS, service->rotate_seconds);\r
+  if (service->rotate_bytes_low) set_number(key, NSSM_REG_ROTATE_BYTES_LOW, service->rotate_bytes_low);\r
+  if (service->rotate_bytes_high) set_number(key, NSSM_REG_ROTATE_BYTES_HIGH, service->rotate_bytes_high);\r
 \r
   /* Environment */\r
   if (service->env) {\r
@@ -353,47 +357,60 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   /* Environment variables to add to existing rather than replace - may fail. */\r
   set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
 \r
-  if (service->env_extra) {\r
-    /* Append these to any other environment variables set. */\r
-    if (service->env) {\r
-      /* Append extra variables to configured variables. */\r
-      unsigned long envlen = service->envlen + service->env_extralen - 1;\r
-      TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
-      if (env) {\r
-        memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
-        /* envlen is in bytes. */\r
-        memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
-\r
-        HeapFree(GetProcessHeap(), 0, service->env);\r
-        service->env = env;\r
-        service->envlen = envlen;\r
+  if (si) {\r
+    if (service->env_extra) {\r
+      /* Append these to any other environment variables set. */\r
+      if (service->env) {\r
+        /* Append extra variables to configured variables. */\r
+        unsigned long envlen = service->envlen + service->env_extralen - 1;\r
+        TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
+        if (env) {\r
+          memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
+          /* envlen is in bytes. */\r
+          memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
+\r
+          HeapFree(GetProcessHeap(), 0, service->env);\r
+          service->env = env;\r
+          service->envlen = envlen;\r
+        }\r
+        else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
       }\r
-      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
-    }\r
-    else {\r
-      /* Append extra variables to our environment. */\r
-      TCHAR *env, *s;\r
-      size_t envlen, len;\r
-\r
-      env = service->env_extra;\r
-      len = 0;\r
-      while (*env) {\r
-        envlen = _tcslen(env) + 1;\r
-        for (s = env; *s && *s != _T('='); s++);\r
-        if (*s == _T('=')) *s++ = _T('\0');\r
-        if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()));\r
-        env += envlen;\r
+      else {\r
+        /* Append extra variables to our environment. */\r
+        TCHAR *env, *s;\r
+        size_t envlen, len;\r
+\r
+        env = service->env_extra;\r
+        len = 0;\r
+        while (*env) {\r
+          envlen = _tcslen(env) + 1;\r
+          for (s = env; *s && *s != _T('='); s++);\r
+          if (*s == _T('=')) *s++ = _T('\0');\r
+          if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()), 0);\r
+          env += envlen;\r
+        }\r
       }\r
     }\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
+    if (rotate_files) service->rotate_files = true;\r
+    else service->rotate_files = false;\r
+  }\r
+  else service->rotate_files = false;\r
+  if (get_number(key, NSSM_REG_ROTATE_SECONDS, &service->rotate_seconds, false) != 1) service->rotate_seconds = 0;\r
+  if (get_number(key, NSSM_REG_ROTATE_BYTES_LOW, &service->rotate_bytes_low, false) != 1) service->rotate_bytes_low = 0;\r
+  if (get_number(key, NSSM_REG_ROTATE_BYTES_HIGH, &service->rotate_bytes_high, false) != 1) service->rotate_bytes_high = 0;\r
+\r
   /* Change to startup directory in case stdout/stderr are relative paths. */\r
   TCHAR cwd[MAX_PATH];\r
   GetCurrentDirectory(_countof(cwd), cwd);\r
   SetCurrentDirectory(service->dir);\r
 \r
   /* Try to get stdout and stderr */\r
-  if (get_output_handles(key, si)) {\r
+  if (get_output_handles(service, key, si)) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service->name, 0);\r
     RegCloseKey(key);\r
     SetCurrentDirectory(cwd);\r