add log4j logging configuration

diff --git a/apache-tomcat.sysconfig b/apache-tomcat.sysconfig
index 588dd65b624eda214074f8bef171aeb85bd3a476..d340d7262f110dad6eaa57566993df22b7046b65 100644 (file)
--- a/apache-tomcat.sysconfig
+++ b/apache-tomcat.sysconfig
@@ -1,6 +1,13 @@
 # Java runtime options used when starting Tomcat
 #CATALINA_OPTS="-Xmx384M -XX:MaxPermSize=192m -XX:PermSize=128m"
 
+# Enable log4j configuration
+#CATALINA_OPTS="$CATALINA_OPTS -Dlog4j.configuration=file:///etc/tomcat/log4j.properties"
+
+# Disable slow urandom. Not recommended!
+# http://stackoverflow.com/questions/137212/how-to-solve-performance-problem-with-java-securerandom
+#CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom"
+
 # Start Tomcat with SecurityManager 
 #SECURITY_MANAGER="yes"
 

diff --git a/log4j.properties b/log4j.properties
new file mode 100644 (file)
index 0000000..cacb07d
--- /dev/null
+++ b/log4j.properties
@@ -0,0 +1,24 @@
+# log console log: catalina.out
+# file log: tomcat.log
+
+# just file logger
+log4j.rootLogger=INFO, file
+# log to console only, DEBUG level
+#log4j.rootLogger=DEBUG, console
+# log to file as well
+#log4j.rootLogger=DEBUG, file, console
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p; %C; %m%n
+
+#- File to log to and log format
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=${catalina.base}/logs/tomcat.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %p; %C; %m%n
+
+log4j.logger.org.apache.catalina=DEBUG, file
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, file
+log4j.logger.org.apache.catalina.core=DEBUG, file
+log4j.logger.org.apache.catalina.session=DEBUG, file

diff --git a/tomcat.spec b/tomcat.spec
index 5d4578ea9e65b9f93f5fccea8ba458828e338ead..682addceb0998a68f2017a395445198708b3c189 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -15,7 +15,7 @@ Summary:      Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP
 Summary(pl.UTF-8):     Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:          tomcat
 Version:       7.0.52
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -29,6 +29,7 @@ Source12:     %{name}-context-manager.xml
 Source13:      %{name}-context-host-manager.xml
 Source14:      %{name}-context-examples.xml
 Source15:      %{name}.logrotate
+Source16:      log4j.properties
 Source100:     http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
 # Source100-md5:       e8e197d628436490886d17cffa108fe3
 Patch0:                %{name}-build.xml.patch
@@ -345,6 +346,7 @@ cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost/manag
 cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost/host-manager.xml
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost/examples.xml
 cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 cp -a bin lib webapps $TOMCATDIR
 cp -a temp $CATALINADIR
@@ -464,7 +466,7 @@ fi
 %dir %{_sysconfdir}/%{name}/Catalina/localhost
 # tomcat config has to be writeable because of tomcat-users.xml file and Catalina dir
 %config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/catalina.policy
-%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.properties*
+%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.properties
 %config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml
 
 %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Catalina/localhost/ROOT.xml