}\r
\r
int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {\r
- bool set_flags = false;\r
+ bool redirect = false;\r
\r
- /* Standard security attributes allowing inheritance. */\r
- SECURITY_ATTRIBUTES attributes;\r
- ZeroMemory(&attributes, sizeof(attributes));\r
- attributes.bInheritHandle = true;\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
+ service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;\r
+ ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));\r
+ return 1;\r
+ }\r
+ if (si && service->stdin_path[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
+\r
+ redirect = true;\r
+ }\r
\r
/* stdout */\r
if (get_createfile_parameters(key, NSSM_REG_STDOUT, service->stdout_path, &service->stdout_sharing, NSSM_STDOUT_SHARING, &service->stdout_disposition, NSSM_STDOUT_DISPOSITION, &service->stdout_flags, NSSM_STDOUT_FLAGS)) {\r
service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
}\r
\r
- set_flags = true;\r
+ redirect = true;\r
}\r
\r
/* stderr */\r
service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
}\r
\r
- set_flags = true;\r
+ redirect = true;\r
}\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
- service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;\r
- ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));\r
- return 1;\r
- }\r
- if (si && service->stdin_path[0]) {\r
- if (str_equiv(service->stdin_path, _T("|"))) {\r
- /* Fake stdin with a pipe. */\r
- if (set_flags) {\r
- /*\r
- None of this is necessary if we aren't redirecting stdout and/or\r
- stderr as well.\r
-\r
- If we don't redirect any handles the application will start and be\r
- quite happy with its console. If we start it with\r
- STARTF_USESTDHANDLES set it will interpret a NULL value for\r
- hStdInput as meaning no input. Because the service starts with\r
- no stdin we can't just pass GetStdHandle(STD_INPUT_HANDLE) to\r
- the application.\r
-\r
- The only way we can successfully redirect the application's output\r
- while preventing programs which exit after reading all input from\r
- exiting prematurely is to create a pipe between ourselves and the\r
- application but write nothing to it.\r
- */\r
- if (! CreatePipe(&si->hStdInput, &service->stdin_pipe, 0, 0)) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_STDIN_CREATEPIPE_FAILED, service->name, error_string(GetLastError()), 0);\r
- return 2;\r
- }\r
- SetHandleInformation(si->hStdInput, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);\r
- }\r
- }\r
- else {\r
- si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, 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
+ if (! redirect || ! si) return 0;\r
\r
- set_flags = true;\r
- }\r
+ /* Allocate a new console so we get a fresh stdin, stdout and stderr. */\r
+ FreeConsole();\r
+ AllocConsole();\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)) _sntprintf_s(displayname, _countof(displayname), _TRUNCATE, _T("%s"), service->name);\r
+ CloseServiceHandle(services);\r
}\r
\r
- if (! set_flags) return 0;\r
+ TCHAR title[65535];\r
+ _sntprintf_s(title, _countof(title), _TRUNCATE, _T("[%s] %s\n"), NSSM, displayname);\r
+ SetConsoleTitle(title);\r
\r
/*\r
We need to set the startup_info flags to make the new handles\r
*/\r
if (si) si->dwFlags |= STARTF_USESTDHANDLES;\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
\r
git://git.iain.cx/iain / nssm.git / blobdiff