Juan Hernandez has uploaded a new change for review. Change subject: tools: Don't hardcode location of log files ......................................................................
tools: Don't hardcode location of log files Currently the locations of the log files of the tools are hardcoded in their log4j.xml files. This makes it difficult to use the tools if they are installed to a location other than the default. This patch changes the startup scripts and the log4j.xml files so that the location of the log files is taken from the ENGINE_LOG configuration parameter. Change-Id: I3723a96b0df0a22378426af314ddc6fb0d02db16 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/tools/src/main/conf/engine-config-log4j.xml M backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml M backend/manager/tools/src/main/conf/engine-notifier-log4j.xml M backend/manager/tools/src/main/shell/engine-config.sh M backend/manager/tools/src/main/shell/engine-manage-domains.sh M backend/manager/tools/src/main/shell/engine-notifier.sh 6 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/12880/1 diff --git a/backend/manager/tools/src/main/conf/engine-config-log4j.xml b/backend/manager/tools/src/main/conf/engine-config-log4j.xml index dff6837..bd7c24b 100644 --- a/backend/manager/tools/src/main/conf/engine-config-log4j.xml +++ b/backend/manager/tools/src/main/conf/engine-config-log4j.xml @@ -3,7 +3,7 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - <param name="File" value="/var/log/ovirt-engine/engine-config.log" /> + <param name="File" value="${log.file}" /> <param name="Append" value="true" /> <param name="MaxFileSize" value="1500KB" /> <param name="MaxBackupIndex" value="1" /> diff --git a/backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml b/backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml index cb27d05..0ca98ea 100644 --- a/backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml +++ b/backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml @@ -4,7 +4,7 @@ <!-- Log levels:DEBUG,INFO,WARN,ERROR,FATAL --> <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - <param name="File" value="/var/log/ovirt-engine/engine-manage-domains.log" /> + <param name="File" value="${log.file}" /> <param name="Append" value="true" /> <param name="MaxFileSize" value="1500KB" /> <param name="MaxBackupIndex" value="1" /> diff --git a/backend/manager/tools/src/main/conf/engine-notifier-log4j.xml b/backend/manager/tools/src/main/conf/engine-notifier-log4j.xml index 01327c5..f211af0 100644 --- a/backend/manager/tools/src/main/conf/engine-notifier-log4j.xml +++ b/backend/manager/tools/src/main/conf/engine-notifier-log4j.xml @@ -4,7 +4,7 @@ <!-- Log levels:DEBUG,INFO,WARN,ERROR,FATAL --> <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> - <param name="File" value="/var/log/ovirt-engine/notifier/notifier.log" /> + <param name="File" value="${log.file}" /> <param name="Append" value="true" /> <param name="MaxFileSize" value="10000KB" /> <param name="MaxBackupIndex" value="5" /> diff --git a/backend/manager/tools/src/main/shell/engine-config.sh b/backend/manager/tools/src/main/shell/engine-config.sh index 73b500a..4dba8c3 100755 --- a/backend/manager/tools/src/main/shell/engine-config.sh +++ b/backend/manager/tools/src/main/shell/engine-config.sh @@ -103,6 +103,7 @@ # Run! exec "${JAVA_HOME}/bin/java" \ -Dlog4j.configuration="file:${ENGINE_ETC}/engine-config/log4j.xml" \ + -Dlog.file="${ENGINE_LOG}/engine-config.log" \ -jar "${JBOSS_HOME}/jboss-modules.jar" \ -dependencies org.ovirt.engine.core.tools \ -class org.ovirt.engine.core.config.EngineConfig \ diff --git a/backend/manager/tools/src/main/shell/engine-manage-domains.sh b/backend/manager/tools/src/main/shell/engine-manage-domains.sh index 2297fdf..91b1184 100755 --- a/backend/manager/tools/src/main/shell/engine-manage-domains.sh +++ b/backend/manager/tools/src/main/shell/engine-manage-domains.sh @@ -119,6 +119,7 @@ "${JAVA_HOME}/bin/java" \ -Dlog4j.configuration="file:${ENGINE_ETC}/engine-manage-domains/log4j.xml" \ + -Dlog.file="${ENGINE_LOG}/engine-manage-domains.log" \ -jar "${JBOSS_HOME}/jboss-modules.jar" \ -dependencies org.ovirt.engine.core.tools \ -class org.ovirt.engine.core.domains.ManageDomains \ diff --git a/backend/manager/tools/src/main/shell/engine-notifier.sh b/backend/manager/tools/src/main/shell/engine-notifier.sh index 3367b9a..92b2e8b 100755 --- a/backend/manager/tools/src/main/shell/engine-notifier.sh +++ b/backend/manager/tools/src/main/shell/engine-notifier.sh @@ -214,6 +214,7 @@ "${JAVA_HOME}/bin/java" \ -Dlog4j.configuration="file:${ENGINE_ETC}/notifier/log4j.xml" \ + -Dlog.file="${ENGINE_LOG}/notifier/notifier.log" \ -jar "${JBOSS_HOME}/jboss-modules.jar" \ -dependencies org.ovirt.engine.core.tools \ -class org.ovirt.engine.core.notifier.Notifier \ -- To view, visit http://gerrit.ovirt.org/12880 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3723a96b0df0a22378426af314ddc6fb0d02db16 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
