Browse Source

fix #2305 add java.util.logging.manager

Shinsuke Sugaya 5 years ago
parent
commit
00d5eac7dc

+ 2 - 0
src/main/assemblies/files/fess.in.bat

@@ -49,6 +49,8 @@ set JAVA_OPTS=%JAVA_OPTS% -Djava.awt.headless=true
 REM maximum # keep-alive connections to maintain at once
 REM maximum # keep-alive connections to maintain at once
 set JAVA_OPTS=%JAVA_OPTS% -Dhttp.maxConnections=20
 set JAVA_OPTS=%JAVA_OPTS% -Dhttp.maxConnections=20
 
 
+set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
+
 REM Force the JVM to use IPv4 stack
 REM Force the JVM to use IPv4 stack
 if NOT "%FESS_USE_IPV4%" == "" (
 if NOT "%FESS_USE_IPV4%" == "" (
 set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true
 set JAVA_OPTS=%JAVA_OPTS% -Djava.net.preferIPv4Stack=true

+ 2 - 0
src/main/assemblies/files/fess.in.sh

@@ -40,6 +40,8 @@ JAVA_OPTS="$JAVA_OPTS -Djava.awt.headless=true"
 # maximum # keep-alive connections to maintain at once
 # maximum # keep-alive connections to maintain at once
 JAVA_OPTS="$JAVA_OPTS -Dhttp.maxConnections=20"
 JAVA_OPTS="$JAVA_OPTS -Dhttp.maxConnections=20"
 
 
+JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager"
+
 # Force the JVM to use IPv4 stack
 # Force the JVM to use IPv4 stack
 if [ "x$FESS_USE_IPV4" != "x" ]; then
 if [ "x$FESS_USE_IPV4" != "x" ]; then
   JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
   JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"

+ 0 - 2
src/main/java/org/codelibs/fess/exec/SuggestCreator.java

@@ -82,8 +82,6 @@ public class SuggestCreator {
     }
     }
 
 
     public static void main(final String[] args) {
     public static void main(final String[] args) {
-        SLF4JBridgeHandler.install();
-
         final Options options = new Options();
         final Options options = new Options();
         final CmdLineParser parser = new CmdLineParser(options);
         final CmdLineParser parser = new CmdLineParser(options);
         try {
         try {

+ 9 - 3
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java

@@ -42,6 +42,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djna.nosys=true
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Dhttp.maxConnections=20
     -Dhttp.maxConnections=20
+    -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
     -server
     -server
     -Xms128m
     -Xms128m
     -Xmx512m
     -Xmx512m
@@ -82,6 +83,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Dfile.encoding=UTF-8
     -Dfile.encoding=UTF-8
     -Djna.nosys=true
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Djdk.io.permissionsUseCanonicalPath=true
+    -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
     -server
     -server
     -Xms128m
     -Xms128m
     -Xmx256m
     -Xmx256m
@@ -112,6 +114,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Dfile.encoding=UTF-8
     -Dfile.encoding=UTF-8
     -Djna.nosys=true
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Djdk.io.permissionsUseCanonicalPath=true
+    -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
     -server
     -server
     -Xms128m
     -Xms128m
     -Xmx256m
     -Xmx256m
@@ -1611,6 +1614,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Djna.nosys=true
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Dhttp.maxConnections=20
     -Dhttp.maxConnections=20
+    -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
     -server
     -server
     -Xms128m
     -Xms128m
     -Xmx512m
     -Xmx512m
@@ -1656,6 +1660,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Dfile.encoding=UTF-8
     -Dfile.encoding=UTF-8
     -Djna.nosys=true
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Djdk.io.permissionsUseCanonicalPath=true
+    -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
     -server
     -server
     -Xms128m
     -Xms128m
     -Xmx256m
     -Xmx256m
@@ -1690,6 +1695,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -Dfile.encoding=UTF-8
     -Dfile.encoding=UTF-8
     -Djna.nosys=true
     -Djna.nosys=true
     -Djdk.io.permissionsUseCanonicalPath=true
     -Djdk.io.permissionsUseCanonicalPath=true
+    -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager
     -server
     -server
     -Xms128m
     -Xms128m
     -Xmx256m
     -Xmx256m
@@ -8858,13 +8864,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             defaultMap.put(FessConfig.APP_DIGEST_ALGORISM, "sha256");
             defaultMap.put(FessConfig.APP_DIGEST_ALGORISM, "sha256");
             defaultMap
             defaultMap
                     .put(FessConfig.JVM_CRAWLER_OPTIONS,
                     .put(FessConfig.JVM_CRAWLER_OPTIONS,
-                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dhttp.maxConnections=20\n-server\n-Xms128m\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=5\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dhttp.maxConnections=20\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=5\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
             defaultMap
             defaultMap
                     .put(FessConfig.JVM_SUGGEST_OPTIONS,
                     .put(FessConfig.JVM_SUGGEST_OPTIONS,
-                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=30\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=30\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n");
             defaultMap
             defaultMap
                     .put(FessConfig.JVM_THUMBNAIL_OPTIONS,
                     .put(FessConfig.JVM_THUMBNAIL_OPTIONS,
-                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=4m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=50\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
+                            "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=4m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=50\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
             defaultMap.put(FessConfig.JOB_SYSTEM_JOB_IDS, "default_crawler");
             defaultMap.put(FessConfig.JOB_SYSTEM_JOB_IDS, "default_crawler");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_WEB, "Web Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_WEB, "Web Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_FILE, "File Crawler - {0}");
             defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_FILE, "File Crawler - {0}");

+ 3 - 0
src/main/resources/fess_config.properties

@@ -23,6 +23,7 @@ jvm.crawler.options=\
 -Djna.nosys=true\n\
 -Djna.nosys=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -Dhttp.maxConnections=20\n\
 -Dhttp.maxConnections=20\n\
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n\
 -server\n\
 -server\n\
 -Xms128m\n\
 -Xms128m\n\
 -Xmx512m\n\
 -Xmx512m\n\
@@ -63,6 +64,7 @@ jvm.suggest.options=\
 -Dfile.encoding=UTF-8\n\
 -Dfile.encoding=UTF-8\n\
 -Djna.nosys=true\n\
 -Djna.nosys=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n\
 -server\n\
 -server\n\
 -Xms128m\n\
 -Xms128m\n\
 -Xmx256m\n\
 -Xmx256m\n\
@@ -93,6 +95,7 @@ jvm.thumbnail.options=\
 -Dfile.encoding=UTF-8\n\
 -Dfile.encoding=UTF-8\n\
 -Djna.nosys=true\n\
 -Djna.nosys=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
 -Djdk.io.permissionsUseCanonicalPath=true\n\
+-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n\
 -server\n\
 -server\n\
 -Xms128m\n\
 -Xms128m\n\
 -Xmx256m\n\
 -Xmx256m\n\