Tweaked logging around servlet container and added warning about jetty

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
master
Andrew DeMaria 6 years ago
parent afb0fb1d27
commit f8686d9638
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 13
      airsonic-main/src/main/java/org/airsonic/player/Application.java

@ -189,6 +189,7 @@ public class Application extends SpringBootServletInitializer implements Embedde
@Override @Override
public void customize(ConfigurableEmbeddedServletContainer container) { public void customize(ConfigurableEmbeddedServletContainer container) {
LOG.trace("Servlet container is {}", container.getClass().getCanonicalName());
// Yes, there is a good reason we do this. // Yes, there is a good reason we do this.
// We cannot count on the tomcat classes being on the classpath which will // We cannot count on the tomcat classes being on the classpath which will
// happen if the war is deployed to another app server like Jetty. So, we // happen if the war is deployed to another app server like Jetty. So, we
@ -197,6 +198,7 @@ public class Application extends SpringBootServletInitializer implements Embedde
try { try {
Class<?> tomcatESCF = Class.forName("org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory"); Class<?> tomcatESCF = Class.forName("org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory");
if(tomcatESCF.isInstance(container)) { if(tomcatESCF.isInstance(container)) {
LOG.info("Detected Tomcat web server");
LOG.debug("Attempting to optimize tomcat"); LOG.debug("Attempting to optimize tomcat");
Object tomcatESCFInstance = tomcatESCF.cast(container); Object tomcatESCFInstance = tomcatESCF.cast(container);
Class<?> tomcatApplicationClass = Class.forName("org.airsonic.player.TomcatApplication"); Class<?> tomcatApplicationClass = Class.forName("org.airsonic.player.TomcatApplication");
@ -207,10 +209,19 @@ public class Application extends SpringBootServletInitializer implements Embedde
LOG.debug("Skipping tomcat optimization as we are not running on tomcat"); LOG.debug("Skipping tomcat optimization as we are not running on tomcat");
} }
} catch (NoClassDefFoundError | ClassNotFoundException e) { } catch (NoClassDefFoundError | ClassNotFoundException e) {
LOG.debug("Skipping tomcat optimization as the tomcat classes are not available"); LOG.debug("No tomcat classes found");
} catch (Exception e) { } catch (Exception e) {
LOG.warn("An error happened while trying to optimize tomcat", e); LOG.warn("An error happened while trying to optimize tomcat", e);
} }
try {
Class<?> jettyESCF = Class.forName("org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory");
if(jettyESCF.isInstance(container)) {
LOG.warn("Detected Jetty web server. Here there be dragons.");
}
} catch (NoClassDefFoundError | ClassNotFoundException e) {
LOG.debug("No jetty classes found");
}
} }
public static void main(String[] args) { public static void main(String[] args) {

Loading…
Cancel
Save