Yaniv Dary has uploaded a new change for review. Change subject: packaging: customization: fixed issue with log4j JRS patch ......................................................................
packaging: customization: fixed issue with log4j JRS patch Bug-Url: https://bugzilla.redhat.com/1083501 Change-Id: Ic87f7aaf9f3a7444845eb1b7bc8fb9b3f4c3d4c1 Signed-off-by: Yaniv Dary <[email protected]> --- M packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in M packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/60/26360/1 diff --git a/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in b/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in index 4e77d44..6918066 100644 --- a/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in +++ b/packaging/jasper-war-patches/ce/900_004_props_change_logs_location.patch.in @@ -4,7 +4,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=${jasperserver.root}/WEB-INF/logs/jasperserver.log +-log4j.appender.fileout.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperserver.log -log4j.appender.fileout.MaxFileSize=1024KB +log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log log4j.appender.fileout.MaxBackupIndex=1 @@ -14,10 +14,10 @@ # 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=${jasperserver.root}/WEB-INF/logs/jasperanalysis.log +-log4j.appender.jasperanalysis.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperanalysis.log -log4j.appender.jasperanalysis.MaxFileSize=1024KB +log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log log4j.appender.jasperanalysis.MaxBackupIndex=1 log4j.appender.jasperanalysis.layout=org.apache.log4j.PatternLayout # Valid date format specifiers for the conversionPattern include "ABSOLUTE", "DATE" and "ISO8601" - \ No newline at end of file + diff --git a/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in b/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in index 58130e2..085747c 100644 --- a/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in +++ b/packaging/jasper-war-patches/pro/900_004_props_change_logs_location.patch.in @@ -1,7 +1,7 @@ --- a/WEB-INF/log4j.properties +++ b/WEB-INF/log4j.properties @@ -40,7 +40,6 @@ log4j.appender.stdout.layout.conversionPattern=%d{ISO8601} %5p %c{1},%t:%L - %m% - # JasperServer Professional users should look for jasperserver-pro.root lower in this file. + # JasperServer Professional users should look for ovirt-engine-reports.root lower in this file. log4j.appender.fileout=org.apache.log4j.RollingFileAppender log4j.appender.fileout.File=${jasperserver.root}/WEB-INF/logs/jasperserver.log -log4j.appender.fileout.MaxFileSize=1024KB @@ -9,7 +9,7 @@ log4j.appender.fileout.layout=org.apache.log4j.PatternLayout # Valid date format specifiers for the conversionPattern include "ABSOLUTE", "DATE" and "ISO8601" @@ -65,7 +64,6 @@ log4j.appender.fileout.layout.conversionPattern=%d{ISO8601} %5p %c{1},%t:%L - %m - # JasperServer Professional users should look for jasperserver-pro.root lower in this file. + # JasperServer Professional users should look for ovirt-engine-reports.root lower in this file. log4j.appender.jasperanalysis=org.apache.log4j.RollingFileAppender log4j.appender.jasperanalysis.File=${jasperserver.root}/WEB-INF/logs/jasperanalysis.log -log4j.appender.jasperanalysis.MaxFileSize=1024KB @@ -18,13 +18,13 @@ # Valid date format specifiers for the conversionPattern include "ABSOLUTE", "DATE" and "ISO8601" @@ -139,8 +137,8 @@ log4j.logger.IntrusionDetector=ERROR #log4j.logger.com.jaspersoft.jasperserver.jaxrs.importexport.ImportJaxrsService=DEBUG# overriding fileout location - # jasperserver-pro.root is used only by JasperServer Professional. + # ovirt-engine-reports.root is used only by JasperServer Professional. # JasperServer Community Edition users should look for jasperserver.root above in this file. --log4j.appender.fileout.File=${jasperserver-pro.root}/WEB-INF/logs/jasperserver.log --log4j.appender.jasperanalysis.File=${jasperserver-pro.root}/WEB-INF/logs/jasperanalysis.log +-log4j.appender.fileout.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperserver.log +-log4j.appender.jasperanalysis.File=${ovirt-engine-reports.root}/WEB-INF/logs/jasperanalysis.log +log4j.appender.fileout.File=@PKG_LOG_DIR@/jasperserver.log +log4j.appender.jasperanalysis.File=@PKG_LOG_DIR@/jasperanalysis.log ## Show some audit related warnings log4j.logger.com.jaspersoft.ji.logging.context=warn - \ No newline at end of file + -- To view, visit http://gerrit.ovirt.org/26360 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic87f7aaf9f3a7444845eb1b7bc8fb9b3f4c3d4c1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
