diff --git a/modules/jenkins/files/logger.conf b/modules/jenkins/files/logger.conf new file mode 100644 index 0000000000..cf99dfb0d5 --- /dev/null +++ b/modules/jenkins/files/logger.conf @@ -0,0 +1,28 @@ +# Properties file which configures the operation of the JDK +# logging facility. +# reference: http://www.javapractices.com/topic/TopicAction.do?Id=143 + +# The system will look for this config file, first using +# a System property specified at startup: +# +# >java -Djava.util.logging.config.file=myLoggingConfigFilePath +# +# If this property is not specified, then the config file is +# retrieved from its default location at: +# +# JDK_HOME/jre/lib/logging.properties + +# Global logging properties. +# ------------------------------------------ +# The set of handlers to be loaded upon startup. +# Comma-separated list of class names. +# (? LogManager docs say no comma here, but JDK example has comma.) +handlers=java.util.logging.ConsoleHandler + +# Loggers +# ------------------------------------------ +# Loggers are usually attached to packages. +# Here, the level for each package is specified. +# The global level is used by default, so levels +# specified here simply act as an override. +org.gearman.session.logger.level=WARNING diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp index 53b5d077df..9497b17610 100644 --- a/modules/jenkins/manifests/master.pp +++ b/modules/jenkins/manifests/master.pp @@ -187,6 +187,14 @@ class jenkins::master( require => File['/var/lib/jenkins/plugins/simple-theme-plugin'], } + file { '/var/lib/jenkins/logger.conf': + ensure => present, + owner => 'jenkins', + group => 'nogroup', + source => 'puppet:///modules/jenkins/logger.conf', + require => File['/var/lib/jenkins'], + } + file { '/var/lib/jenkins/plugins/simple-theme-plugin/title.png': ensure => present, owner => 'jenkins', diff --git a/modules/openstack_project/files/jenkins/jenkins.default b/modules/openstack_project/files/jenkins/jenkins.default index e88724887c..ce455a6ef8 100644 --- a/modules/openstack_project/files/jenkins/jenkins.default +++ b/modules/openstack_project/files/jenkins/jenkins.default @@ -11,7 +11,7 @@ JAVA=/usr/bin/java #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address # Disable compression as zip deflation threads eat CPU time. # https://issues.jenkins-ci.org/browse/JENKINS-14362 -JAVA_ARGS="-Xloggc:/var/log/jenkins/gc.log -XX:+PrintGCDetails -Xmx12g -Dorg.kohsuke.stapler.compression.CompressionFilter.disabled=true" +JAVA_ARGS="-Xloggc:/var/log/jenkins/gc.log -XX:+PrintGCDetails -Xmx12g -Dorg.kohsuke.stapler.compression.CompressionFilter.disabled=true -Djava.util.logging.config.file=/var/lib/jenkins/logger.conf" PIDFILE=/var/run/jenkins/jenkins.pid