0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1972 update tomcat boot

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-01-21 06:53:26 +09:00
parent c8f033eb3c
commit 372f9211f4
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -71,8 +71,8 @@
<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>9.0.13</tomcat.version>
<tomcat.boot.version>0.7.0</tomcat.boot.version>
<tomcat.version>9.0.14</tomcat.version>
<tomcat.boot.version>0.7.1-RC1</tomcat.boot.version>
<!-- DEB & RPM build -->
<packaging.fess.home.dir>/usr/share/fess</packaging.fess.home.dir>

17
src/main/java/org/codelibs/fess/FessBoot.java
View file

@ -86,8 +86,12 @@ public class FessBoot extends TomcatBoot {
fessLogPath = "../../logs";
}
op.replace("fess.log.path", fessLogPath.replace("\\", "/"));
}) // uses jdk14logger
.asDevelopment(isNoneEnv()).bootAwait();
}).asYouLikeIt(resource -> {
Host host = resource.getHost();
if (host instanceof StandardHost) {
((StandardHost) host).setErrorReportValveClass(SuppressErrorReportValve.class.getName());
}
}).asDevelopment(isNoneEnv()).bootAwait();
}
public static void shutdown(final String[] args) {
@ -121,13 +125,4 @@ public class FessBoot extends TomcatBoot {
protected static String getTomcatConfigPath() {
return System.getProperty(TOMCAT_CONFIG_PATH);
}
@Override
protected void adjustServer() {
super.adjustServer();
final Host host = server.getHost();
if (host instanceof StandardHost) {
((StandardHost) host).setErrorReportValveClass(SuppressErrorReportValve.class.getName());
}
}
}