Allocate new console by default.

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index d18e31c..41139a0 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -135,26 +135,14 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
   return 1;\r
 }\r
 \r
-HANDLE append_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
-  HANDLE ret;\r
-\r
-  /* Try to append to the file first. */\r
-  ret = CreateFile(path, FILE_APPEND_DATA, sharing, attributes, disposition, flags, 0);\r
+HANDLE write_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
+  HANDLE ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
   if (ret) {\r
-    SetEndOfFile(ret);\r
+    if (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);\r
     return ret;\r
   }\r
 \r
-  unsigned long error = GetLastError();\r
-  if (error != ERROR_FILE_NOT_FOUND) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(error), 0);\r
-    return (HANDLE) 0;\r
-  }\r
-\r
-  /* It didn't exist.  Create it. */\r
-  ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
-  if (! ret) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);\r
-\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);\r
   return ret;\r
 }\r
 \r
@@ -243,12 +231,26 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
 }\r
 \r
 int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {\r
-  bool set_flags = false;\r
+  /* Allocate a new console so we get a fresh stdin, stdout and stderr. */\r
+  if (si && ! service->no_console) {\r
+    FreeConsole();\r
+    AllocConsole();\r
+    banner();\r
+\r
+    /* Set a title like "[NSSM] Jenkins" */\r
+    TCHAR displayname[SERVICE_NAME_LENGTH];\r
+    unsigned long len = _countof(displayname);\r
+    SC_HANDLE services = open_service_manager();\r
+    if (services) {\r
+      if (! GetServiceDisplayName(services, service->name, displayname, &len)) ZeroMemory(displayname, sizeof(displayname));\r
+      CloseServiceHandle(services);\r
+    }\r
+    if (! displayname[0]) _sntprintf_s(displayname, _countof(displayname), _TRUNCATE, _T("%s"), service->name);\r
 \r
-  /* Standard security attributes allowing inheritance. */\r
-  SECURITY_ATTRIBUTES attributes;\r
-  ZeroMemory(&attributes, sizeof(attributes));\r
-  attributes.bInheritHandle = true;\r
+    TCHAR title[65535];\r
+    _sntprintf_s(title, _countof(title), _TRUNCATE, _T("[%s] %s"), NSSM, displayname);\r
+    SetConsoleTitle(title);\r
+  }\r
 \r
   /* stdin */\r
   if (get_createfile_parameters(key, NSSM_REG_STDIN, service->stdin_path, &service->stdin_sharing, NSSM_STDIN_SHARING, &service->stdin_disposition, NSSM_STDIN_DISPOSITION, &service->stdin_flags, NSSM_STDIN_FLAGS)) {\r
@@ -257,12 +259,11 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
     return 1;\r
   }\r
   if (si && service->stdin_path[0]) {\r
-    si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, service->stdin_disposition, service->stdin_flags, 0);\r
+    si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, 0, service->stdin_disposition, service->stdin_flags, 0);\r
     if (! si->hStdInput) {\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);\r
       return 2;\r
     }\r
-    set_flags = true;\r
   }\r
 \r
   /* stdout */\r
@@ -273,7 +274,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
   }\r
   if (si && service->stdout_path[0]) {\r
     if (service->rotate_files) rotate_file(service->name, service->stdout_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);\r
-    HANDLE stdout_handle = append_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
+    HANDLE stdout_handle = write_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
     if (! stdout_handle) return 4;\r
 \r
     if (service->rotate_files && service->rotate_stdout_online) {\r
@@ -293,8 +294,6 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       }\r
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
     }\r
-\r
-    set_flags = true;\r
   }\r
 \r
   /* stderr */\r
@@ -321,7 +320,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
     }\r
     else if (si) {\r
       if (service->rotate_files) rotate_file(service->name, service->stderr_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high);\r
-      HANDLE stderr_handle = append_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\r
+      HANDLE stderr_handle = write_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\r
       if (! stderr_handle) return 7;\r
 \r
       if (service->rotate_files && service->rotate_stderr_online) {\r
@@ -341,18 +340,38 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
         }\r
         service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
       }\r
-\r
-      set_flags = true;\r
     }\r
   }\r
 \r
-  if (! set_flags) return 0;\r
+  if (! si) return 0;\r
 \r
   /*\r
     We need to set the startup_info flags to make the new handles\r
     inheritable by the new process.\r
   */\r
-  if (si) si->dwFlags |= STARTF_USESTDHANDLES;\r
+  si->dwFlags |= STARTF_USESTDHANDLES;\r
+\r
+  if (service->no_console) return 0;\r
+\r
+  /* Redirect other handles. */\r
+  if (! si->hStdInput) {\r
+    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), GetCurrentProcess(), &si->hStdInput, 0, true, DUPLICATE_SAME_ACCESS)) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_INPUT_HANDLE"), _T("stdin"), error_string(GetLastError()), 0);\r
+      return 8;\r
+    }\r
+  }\r
+  if (! si->hStdOutput) {\r
+    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_SAME_ACCESS)) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_OUTPUT_HANDLE"), _T("stdout"), error_string(GetLastError()), 0);\r
+      return 9;\r
+    }\r
+  }\r
+  if (! si->hStdError)  {\r
+    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_ERROR_HANDLE"), _T("stderr"), error_string(GetLastError()), 0);\r
+      return 10;\r
+    }\r
+  }\r
 \r
   return 0;\r
 }\r
@@ -531,7 +550,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           }\r
 \r
           /* Reopen. */\r
-          logger->write_handle = append_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
+          logger->write_handle = write_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
           if (! logger->write_handle) {\r
             error = GetLastError();\r
             log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, logger->path, error_string(error), 0);\r