You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/11/22 17:58:12 UTC
[commons-daemon] branch master updated (b57b73a -> 3f12d66)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.
from b57b73a Fix DAEMON-410. jsvc libjvm.so search path
new 3e5d6d9 Revert "[DAEMON-414] prunsrv uses its log is before it is initialized. (#13)"
new 3f12d66 Revert [DAEMON-414] prunsrv uses its log is before it is initialized.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/changes/changes.xml | 3 ---
src/native/windows/apps/prunsrv/prunsrv.c | 13 ++++++-------
2 files changed, 6 insertions(+), 10 deletions(-)
[commons-daemon] 01/02: Revert "[DAEMON-414] prunsrv uses its log
is before it is initialized. (#13)"
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 3e5d6d9e7a07180d1053b14cba5a4e9d14164fd1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 22 12:56:24 2019 -0500
Revert "[DAEMON-414] prunsrv uses its log is before it is initialized. (#13)"
This reverts commit ce98c4021e1e32909afb0fc3524bd250dc6766a6.
---
src/native/windows/apps/prunsrv/prunsrv.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c
index d854664..a12ccff 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -1755,13 +1755,6 @@ void __cdecl main(int argc, char **argv)
/* Create the main Pool */
gPool = apxPoolCreate(NULL, 0);
- apxLogOpen(gPool, SO_LOGPATH, SO_LOGPREFIX, SO_LOGROTATE);
- apxLogLevelSetW(NULL, SO_LOGLEVEL);
- apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon procrun (%s %d-bit) logging initialized.",
- PRG_VERSION, PRG_BITS);
- if (SO_LOGROTATE)
- apxLogWrite(APXLOG_MARK_DEBUG "Log will rotate each %d seconds.", SO_LOGROTATE);
-
/* Parse the command line */
if ((lpCmdline = apxCmdlineParse(gPool, _options, _commands, _altcmds)) == NULL) {
apxLogWrite(APXLOG_MARK_ERROR "Invalid command line arguments.");
@@ -1778,6 +1771,12 @@ void __cdecl main(int argc, char **argv)
}
}
+ apxLogOpen(gPool, SO_LOGPATH, SO_LOGPREFIX, SO_LOGROTATE);
+ apxLogLevelSetW(NULL, SO_LOGLEVEL);
+ apxLogWrite(APXLOG_MARK_DEBUG "Apache Commons Daemon procrun log initialized.");
+ if (SO_LOGROTATE)
+ apxLogWrite(APXLOG_MARK_DEBUG "Log will rotate each %d seconds.", SO_LOGROTATE);
+
apxLogWrite(APXLOG_MARK_INFO "Apache Commons Daemon procrun (%s %d-bit) started.",
PRG_VERSION, PRG_BITS);
[commons-daemon] 02/02: Revert [DAEMON-414] prunsrv uses its log is
before it is initialized.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 3f12d669f7f9ef46cb7b6e9f60c31cbe91fa961b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 22 12:58:09 2019 -0500
Revert [DAEMON-414] prunsrv uses its log is before it is initialized.
---
src/changes/changes.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1a6f3f7..5bc9c14 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -39,9 +39,6 @@
</properties>
<body>
<release version="1.2.3" date="TBD" description="Bug fix release">
- <action issue="DAEMON-414" type="fix" dev="ggregory" due-to="Gary Gregory">
- prunsrv uses its log is before it is initialized.
- </action>
<action issue="DAEMON-411" type="fix" dev="markt">
Procrun. Correct multiple issues related to enabling a service to
interact with the desktop. Provide a better error message if this option