From 372f9211f4e5d21563f09bc37bf3237c8c8add06 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Mon, 21 Jan 2019 06:53:26 +0900
Subject: [PATCH] fix #1972 update tomcat boot
---
pom.xml | 4 ++--
src/main/java/org/codelibs/fess/FessBoot.java | 17 ++++++-----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 05eb60a53..9b6353842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java
index 276b00504..93423a750 100644
--- a/src/main/java/org/codelibs/fess/FessBoot.java
+++ b/src/main/java/org/codelibs/fess/FessBoot.java
@@ -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());
- }
- }
}
--
GitLab