derryh/ujetl
1
0
Fork 0
mirror of https://github.com/rasilon/ujetl.git synced 2026-04-11 10:29:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix java version, and logging configs

Browse source
This commit is contained in:
Derry Hamilton 2019-06-11 16:25:30 +01:00
parent 751aec4b63
commit 07e97398af
5 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docker/Dockerfile
View file

@ -8,6 +8,9 @@ MAINTAINER Derry Hamilton <derryh@postcodelottery.co.uk>
# Install up-to-date epel rpm repository # Install up-to-date epel rpm repository
RUN yum -y install epel-release RUN yum -y install epel-release
# Install java first, to get a sensible one.
RUN yum -y install java-1.8.0-openjdk-devel
# Install various packages to get compile environment # Install various packages to get compile environment
RUN yum -y groupinstall 'Development Tools' RUN yum -y groupinstall 'Development Tools'

28
install_extra/copying_defaults_log4j.properties
View file

@ -1,28 +0,0 @@
log4j.rootLogger=info, stdout, R, SYSLOG
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Threshold=info
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
# Pattern to output the caller's file name and line number.
#log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %d - %m%n
log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} %x - %m%n
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=/tmp/DefaultCopyingApp.log
log4j.appender.R.MaxFileSize=100KB
# Keep one backup file
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%p %t %c %d - %m%n
log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender
log4j.appender.SYSLOG.Threshold=info
log4j.appender.SYSLOG.syslogHost=localhost
log4j.appender.SYSLOG.Facility=LOCAL4
log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
log4j.appender.SYSLOG.layout.conversionPattern=%d{ISO8601} %-5p [%t] %c{2} %x - %m%n

13
install_extra/copying_defaults_log4j.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="INFO">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>
<Root level="INFO">
<AppenderRef ref="Console"/>
</Root>
</Loggers>
</Configuration>

8
install_extra/run_copying_job
View file

@ -12,11 +12,11 @@ then
exit 2 exit 2
fi fi
LOG_PROPS=/etc/ujetl/copying_defaults_log4j.properties LOG_PROPS=/etc/ujetl/copying_defaults_log4j.xml
if [ -e "/etc/ujetl/${JOBNAME}_log4j.properties" ] if [ -e "/etc/ujetl/${JOBNAME}_log4j.xml" ]
then then
echo Using log config "/etc/ujetl/${JOBNAME}_log4j.properties" echo Using log config "/etc/ujetl/${JOBNAME}_log4j.xml"
LOG_PROPS="/etc/ujetl/${JOBNAME}_log4j.properties" LOG_PROPS="/etc/ujetl/${JOBNAME}_log4j.xml"
else else
echo Using default logging. echo Using default logging.
fi fi

4
uJETL.spec
View file

@ -25,9 +25,9 @@ true
mkdir -p $RPM_BUILD_ROOT/usr/share/ujetl/lib $RPM_BUILD_ROOT/etc/ujetl $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/share/ujetl/lib $RPM_BUILD_ROOT/etc/ujetl $RPM_BUILD_ROOT/usr/bin
cp target/CopyingApp-*-jar-with-dependencies.jar $RPM_BUILD_ROOT/usr/share/ujetl/lib/CopyingApp.jar cp target/CopyingApp-*-jar-with-dependencies.jar $RPM_BUILD_ROOT/usr/share/ujetl/lib/CopyingApp.jar
cp install_extra/run_copying_job $RPM_BUILD_ROOT/usr/bin cp install_extra/run_copying_job $RPM_BUILD_ROOT/usr/bin
cp install_extra/copying_defaults_log4j.properties $RPM_BUILD_ROOT/etc/ujetl cp install_extra/copying_defaults_log4j.xml $RPM_BUILD_ROOT/etc/ujetl
%files %files
/usr/share/ujetl/lib/CopyingApp.jar /usr/share/ujetl/lib/CopyingApp.jar
/usr/bin/run_copying_job /usr/bin/run_copying_job
/etc/ujetl/copying_defaults_log4j.properties /etc/ujetl/copying_defaults_log4j.xml