[commons-daemon] branch master updated: Expand debug logging for Java start mode

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new dd150f0  Expand debug logging for Java start mode
dd150f0 is described below

commit dd150f00b0a6b115b2c8da62233723c7364e424b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Nov 23 15:49:39 2019 +0000

    Expand debug logging for Java start mode
---
 src/changes/changes.xml           | 3 +++
 src/native/windows/src/rprocess.c | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5bc9c14..89e097e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -50,6 +50,9 @@
         jsvc. Update the list of paths searched for libjvm.so to include the
         path used by OpenJDK 11.
       </action>
+      <action type="add", dev="markt">
+        procrun. Add additional debug logging for Java start mode.
+      </action>
     </release>
     <release version="1.2.2" date="2019-10-04" description="Bug fix release">
       <action issue="DAEMON-408" type="fix" dev="markt">
diff --git a/src/native/windows/src/rprocess.c 
b/src/native/windows/src/rprocess.c
index 727ff18..27f223a 100644
--- a/src/native/windows/src/rprocess.c
+++ b/src/native/windows/src/rprocess.c
@@ -119,7 +119,7 @@ static DWORD WINAPI __apxProcWorkerThread(LPVOID 
lpParameter)
 
         /* store worker's exit code as VM exit code for later use */
         GetExitCodeProcess(lpProc->stProcInfo.hProcess, &dwExitCode);
-        apxLogWrite(APXLOG_MARK_DEBUG "Child process exit code %d", 
dwExitCode);
+        apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon Child process 
exit code %d", dwExitCode);
         apxSetVmExitCode(dwExitCode);
     }
     ExitThread(0);
@@ -550,6 +550,10 @@ apxProcessExecute(APXHANDLE hProcess)
        apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon 
GetEnvironmentStringsW()");
        lpProc->lpEnvironment = GetEnvironmentStringsW();
 
+       apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon Application name: 
%S", lpProc->szApplicationExec);
+       apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon Command line: %S", 
lpProc->szCommandLine);
+       apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon Working path: %S", 
lpProc->szWorkingPath);
+
     if (!IS_INVALID_HANDLE(lpProc->hUserToken)) {
         si.lpDesktop = _desktop_name;
                apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon 
CreateProcessAsUserW()");
@@ -566,9 +570,6 @@ apxProcessExecute(APXHANDLE hProcess)
                                   &(lpProc->stProcInfo));
     }
     else {
-        OutputDebugStringW(lpProc->szApplicationExec);
-        OutputDebugStringW(lpProc->szCommandLine);
-
                apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon 
CreateProcessW()");
                bS = CreateProcessW(lpProc->szApplicationExec,
                             lpProc->szCommandLine,