Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: use correct log location
......................................................................
packaging: setup: use correct log location
Change-Id: Ib3b8098cbb3d72b158a438544c7a1d1e60273cf0
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M .gitignore
M Makefile
M ovirt-engine-reports.spec.in
R server-customizations/WEB-INF/log4j.properties.in
4 files changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/14/23314/1
diff --git a/.gitignore b/.gitignore
index c275f8e..49ea166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
###########################
build/python-check.sh.in
ovirt-engine-reports.spec
+server-customizations/WEB-INF/log4j.properties
diff --git a/Makefile b/Makefile
index bec48df..2197f53 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@
GENERATED = \
build/python-check.sh \
ovirt-engine-reports.spec \
+ server-customizations/WEB-INF/log4j.properties \
$(NULL)
all: \
@@ -252,3 +253,5 @@
DEV_FLIST=tmp.dev.flist \
$(NULL)
cp tmp.dev.flist "$(DESTDIR)$(PREFIX)/dev.$(PACKAGE_NAME).flist"
+
+ install -d "$(DESTDIR)$(PKG_LOG_DIR)"
diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in
index 0afe54e..05c1268 100644
--- a/ovirt-engine-reports.spec.in
+++ b/ovirt-engine-reports.spec.in
@@ -21,6 +21,7 @@
PYTHON_DIR=%{python_sitelib} \\\
JAVA_DIR=%{_javadir} \\\
PKG_JAVA_DIR=%{reports_java} \\\
+ PKG_LOG_DIR=%{_localstatedir}/log/%{reports_name} \\\
%{?BUILD_FLAGS:BUILD_FLAGS="%{BUILD_FLAGS}"} \\\
%{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"}
@@ -73,6 +74,11 @@
%{__python} -m compileall -f -q -d / "%{buildroot}"
%{__python} -O -m compileall -f -q -d / "%{buildroot}"
+#
+# /var creation
+#
+install -dm 755 "%{buildroot}/%{_localstatedir}/log/%{name}"
+
# Needed for compatibility if package is different than the directory structure
%if "%{name}" != "%{reports_name}"
ln -s -f "%{_bindir}/%{reports_name}-setup"
"%{buildroot}%{_bindir}/%{name}-setup"
@@ -88,6 +94,7 @@
%files
%dir %{_sysconfdir}/%{reports_name}/ovirt-engine-reports.conf.d
+%dir %attr(-, %{engine_user}, %{engine_group}) %{_localstatedir}/log/%{name}
%{_sysconfdir}/ovirt-engine/engine.conf.d/50-ovirt-engine-reports.conf
%{reports_java}
%{_datadir}/%{reports_name}
diff --git a/server-customizations/WEB-INF/log4j.properties
b/server-customizations/WEB-INF/log4j.properties.in
similarity index 97%
rename from server-customizations/WEB-INF/log4j.properties
rename to server-customizations/WEB-INF/log4j.properties.in
index b3baa76..2b4e935 100644
--- a/server-customizations/WEB-INF/log4j.properties
+++ b/server-customizations/WEB-INF/log4j.properties.in
@@ -39,7 +39,7 @@
# jasperserver.root is used only by JasperServer Community Edition.
# JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
log4j.appender.fileout=org.apache.log4j.RollingFileAppender
-log4j.appender.fileout.File=/var/log/ovirt-engine/jasperserver.log
+log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log
log4j.appender.fileout.MaxFileSize=1024KB
log4j.appender.fileout.MaxBackupIndex=1
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
@@ -64,7 +64,7 @@
# jasperserver.root is used only by JasperServer Community Edition.
# JasperServer Professional users should look for jasperserver-pro.root lower
in this file.
log4j.appender.jasperanalysis=org.apache.log4j.RollingFileAppender
-log4j.appender.jasperanalysis.File=/var/log/ovirt-engine/jasperanalysis.log
+log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log
log4j.appender.jasperanalysis.MaxFileSize=1024KB
log4j.appender.jasperanalysis.MaxBackupIndex=1
log4j.appender.jasperanalysis.layout=org.apache.log4j.PatternLayout
--
To view, visit http://gerrit.ovirt.org/23314
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3b8098cbb3d72b158a438544c7a1d1e60273cf0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
