modules/enterprise/agent/src/etc/rhq-agent-env.bat | 9 ++++++--- modules/enterprise/agent/src/etc/rhq-agent-env.sh | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-)
New commits: commit 0ed38f2bf952d9cf773e092856b93f1d438fcabe Author: Ian Springer ian.springer@redhat.com Date: Fri Feb 3 13:17:37 2012 -0500
[787250] add comment telling user not to include the --daemon option in RHQ_AGENT_CMDLINE_OPTS (https://bugzilla.redhat.com/show_bug.cgi?id=787250)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.bat b/modules/enterprise/agent/src/etc/rhq-agent-env.bat index 7116516..62d727b 100644 --- a/modules/enterprise/agent/src/etc/rhq-agent-env.bat +++ b/modules/enterprise/agent/src/etc/rhq-agent-env.bat @@ -103,11 +103,14 @@ rem passed through to the RHQ Agent. rem If you want to have command line arguments rem added to the arguments specified here, append rem '%*' to the end of this option. For example, -rem "--daemon %*". In this case, both the command +rem "--nonative %*". In this case, both the command rem line options and the ones specified here will -rem be passed to the agent. +rem be passed to the Agent. Note, the --daemon option +rem should generally not be included here, since it +rem would cause the Agent to always start in daemon +rem mode, even when started via rhq-agent.bat. rem -rem set RHQ_AGENT_CMDLINE_OPTS=--nonative +rem set RHQ_AGENT_CMDLINE_OPTS=--nonative %*
rem =========================================================================== rem THE FOLLOWING ARE USED SOLELY FOR THE rhq-agent-wrapper.bat SCRIPT diff --git a/modules/enterprise/agent/src/etc/rhq-agent-env.sh b/modules/enterprise/agent/src/etc/rhq-agent-env.sh index bb679ef..c7a259e 100755 --- a/modules/enterprise/agent/src/etc/rhq-agent-env.sh +++ b/modules/enterprise/agent/src/etc/rhq-agent-env.sh @@ -99,11 +99,14 @@ # If you want to have command line arguments # added to the arguments specified here, append # '$*' to the end of this option. For example, -# "--daemon $*". In this case, both the command +# "--nonative $*". In this case, both the command # line options and the ones specified here will -# be passed to the agent. +# be passed to the Agent. Note, the --daemon option +# should generally not be included here, since it +# would cause the Agent to always start in daemon +# mode, even when started via rhq-agent.sh. # -#RHQ_AGENT_CMDLINE_OPTS="--daemon --nonative" +#RHQ_AGENT_CMDLINE_OPTS="--nonative $*"
# RHQ_AGENT_IN_BACKGROUND - If this is defined, the RHQ Agent JVM will # be launched in the background (thus causing this
rhq-commits@lists.fedorahosted.org