Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tomcat9
Commits: 7d5f29d5 by Emmanuel Bourg at 2022-06-21T11:14:13+02:00 Depend on libeclipse-jdt-core-java (>= 3.26.0) - - - - - 80a46db7 by Emmanuel Bourg at 2022-06-21T14:02:32+02:00 Depend on systemd-sysusers and systemd-tmpfiles instead of systemd - - - - - 3259549e by Emmanuel Bourg at 2022-06-21T14:52:41+02:00 Fallback to the default log formatter when systemd isn't used - - - - - c1d82984 by Emmanuel Bourg at 2022-06-21T14:59:09+02:00 Upload to unstable - - - - - 3 changed files: - debian/changelog - debian/control - debian/patches/0024-systemd-log-formatter.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +tomcat9 (9.0.64-2) unstable; urgency=medium + + * Fallback to the default log formatter when systemd isn't used + * Depend on systemd-sysusers and systemd-tmpfiles instead of systemd + * Depend on libeclipse-jdt-core-java (>= 3.26.0) + + -- Emmanuel Bourg <[email protected]> Tue, 21 Jun 2022 14:59:03 +0200 + tomcat9 (9.0.64-1) unstable; urgency=medium * New upstream release ===================================== debian/control ===================================== @@ -14,7 +14,7 @@ Build-Depends: junit4 (>= 4.11), libcglib-nodep-java, libeasymock-java (>= 3.0), - libeclipse-jdt-core-java (>= 3.18.0), + libeclipse-jdt-core-java (>= 3.26.0), libhamcrest-java (>= 1.3), libjaxrpc-api-java, libobjenesis-java, @@ -47,7 +47,8 @@ Package: tomcat9 Architecture: all Depends: lsb-base (>= 3.0-6), - systemd (>= 238), + systemd-sysusers, + systemd-tmpfiles, tomcat9-common (>= ${source:Version}), ucf, ${misc:Depends} @@ -91,7 +92,7 @@ Description: Apache Tomcat 9 - Servlet and JSP engine -- tools to create user in Package: libtomcat9-java Architecture: all -Depends: libeclipse-jdt-core-java (>= 3.18.0), ${misc:Depends} +Depends: libeclipse-jdt-core-java (>= 3.26.0), ${misc:Depends} Suggests: tomcat9 (>= ${source:Version}) Description: Apache Tomcat 9 - Servlet and JSP engine -- core libraries Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) @@ -103,7 +104,7 @@ Description: Apache Tomcat 9 - Servlet and JSP engine -- core libraries Package: libtomcat9-embed-java Architecture: all -Depends: libeclipse-jdt-core-java (>= 3.18.0), ${misc:Depends} +Depends: libeclipse-jdt-core-java (>= 3.26.0), ${misc:Depends} Description: Apache Tomcat 9 - Servlet and JSP engine -- embed libraries Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Oracle, and provides a "pure Java" HTTP web ===================================== debian/patches/0024-systemd-log-formatter.patch ===================================== @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- /dev/null +++ b/java/org/apache/juli/SystemdFormatter.java -@@ -0,0 +1,98 @@ +@@ -0,0 +1,109 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with @@ -38,9 +38,16 @@ Forwarded: no + * </li> + * <li>Tabulations are replaced by spaces (they are escaped as <tt>#011</tt> in /var/log/syslog otherwise)</li> + * </ul> ++ * ++ * If systemd isn't enabled the format falls back to the default one-line format. + */ +public class SystemdFormatter extends Formatter { + ++ /** Default formatter if Tomcat isn't managed by systemd */ ++ private final Formatter defaultFormatter = new OneLineFormatter(); ++ ++ private boolean systemdEnabled = System.getenv("INVOCATION_ID") != null && System.getenv("JOURNAL_STREAM") != null; ++ + /** Mapping between JUL levels and systemd logging levels */ + private TreeMap<Integer, String> levelMapping = new TreeMap<>(); + { @@ -56,6 +63,10 @@ Forwarded: no + + @Override + public String format(LogRecord record) { ++ if (!systemdEnabled) { ++ return defaultFormatter.format(record); ++ } ++ + StringBuilder sb = new StringBuilder(); + + // Severity View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/2ee376a7978e3c05668f1a0b6e833309097b8fac...c1d829846903543eae9e42be5edb9e85d8f14470 -- View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/2ee376a7978e3c05668f1a0b6e833309097b8fac...c1d829846903543eae9e42be5edb9e85d8f14470 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
