From f8161f5184441c9d9fd17a576a2c903d8b792c9d Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 20 Oct 2018 16:42:23 -0400 Subject: [PATCH] White list jars that are scanned for tlds to prevent spurious logs Signed-off-by: Andrew DeMaria --- .../main/java/org/airsonic/player/TomcatApplication.java | 6 ++++++ airsonic-main/src/main/resources/application.properties | 3 +++ 2 files changed, 9 insertions(+) diff --git a/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java b/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java index 8cf23390..d62dea83 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java +++ b/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java @@ -3,6 +3,7 @@ package org.airsonic.player; import org.apache.catalina.Container; import org.apache.catalina.Wrapper; import org.apache.catalina.webresources.StandardRoot; +import org.apache.tomcat.util.scan.StandardJarScanFilter; import org.springframework.boot.context.embedded.tomcat.TomcatContextCustomizer; import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; @@ -12,6 +13,11 @@ public class TomcatApplication { tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> { + StandardJarScanFilter standardJarScanFilter = new StandardJarScanFilter(); + standardJarScanFilter.setTldScan("dwr-*.jar,jstl-*.jar,spring-security-taglibs-*.jar,spring-web-*.jar,spring-webmvc-*.jar,string-*.jar,taglibs-standard-impl-*.jar,tomcat-annotations-api-*.jar,tomcat-embed-jasper-*.jar"); + standardJarScanFilter.setTldSkip("*"); + context.getJarScanner().setJarScanFilter(standardJarScanFilter); + boolean development = (System.getProperty("airsonic.development") != null); // Increase the size and time before eviction of the Tomcat diff --git a/airsonic-main/src/main/resources/application.properties b/airsonic-main/src/main/resources/application.properties index 3ab7c4db..a536e667 100644 --- a/airsonic-main/src/main/resources/application.properties +++ b/airsonic-main/src/main/resources/application.properties @@ -6,3 +6,6 @@ logging.level.org.airsonic=INFO logging.level.liquibase=INFO logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p){green} %clr(---){faint} %clr(%-40.40logger{32}){blue} %clr(:){faint} %m%n%wEx logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- %-40.40logger{32} : %m%n%wEx + +# Helpful to debug which jars are scanned +#logging.level.org.apache.tomcat.util.scan=TRACE