MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/471' into develop

Browse Source
This commit is contained in:
Andrew DeMaria
2017-06-23 20:24:41 -06:00
parent 2b667bf0b2 5ffec4403a
commit 2c1d959215
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/boot/TomcatApplication.java
+7 -1
View File
@@ -12,14 +12,20 @@ public class TomcatApplication {
tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> { tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> {
boolean development = (System.getProperty("libresonic.development") != null);
// Increase the size and time before eviction of the Tomcat // Increase the size and time before eviction of the Tomcat
// cache so that resources aren't uncompressed too often. // cache so that resources aren't uncompressed too often.
// See https://github.com/jhipster/generator-jhipster/issues/3995 // See https://github.com/jhipster/generator-jhipster/issues/3995
StandardRoot resources = new StandardRoot(); StandardRoot resources = new StandardRoot();
if (development) {
resources.setCachingAllowed(false);
} else {
resources.setCacheMaxSize(100000); resources.setCacheMaxSize(100000);
resources.setCacheObjectMaxSize(4000); resources.setCacheObjectMaxSize(4000);
resources.setCacheTtl(24 * 3600 * 1000); // 1 day, in milliseconds resources.setCacheTtl(24 * 3600 * 1000); // 1 day, in milliseconds
}
context.setResources(resources); context.setResources(resources);
// Put Jasper in production mode so that JSP aren't recompiled // Put Jasper in production mode so that JSP aren't recompiled
@@ -27,7 +33,7 @@ public class TomcatApplication {
// See http://stackoverflow.com/questions/29653326/spring-boot-application-slow-because-of-jsp-compilation // See http://stackoverflow.com/questions/29653326/spring-boot-application-slow-because-of-jsp-compilation
Container jsp = context.findChild("jsp"); Container jsp = context.findChild("jsp");
if (jsp instanceof Wrapper) { if (jsp instanceof Wrapper) {
((Wrapper) jsp).addInitParameter("development", "false"); ((Wrapper) jsp).addInitParameter("development", Boolean.toString(development));
} }
}); });
} }