Explorar o código

fix #1737 update jcifs settings

Shinsuke Sugaya %!s(int64=7) %!d(string=hai) anos
pai
achega
e28b72f0ab

+ 14 - 10
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java

@@ -65,9 +65,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
-    -Djcifs.smb.client.connTimeout=60000
-    -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.responseTimeout=30000
+    -Djcifs.smb.client.soTimeout=35000
+    -Djcifs.smb.client.connTimeout=60000
+    -Djcifs.smb.client.sessionTimeout=60000
     -Dgroovy.use.classvalue=true
     -Dgroovy.use.classvalue=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noKeySetOptimization=true
     -Dio.netty.noKeySetOptimization=true
@@ -121,9 +122,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
-    -Djcifs.smb.client.connTimeout=60000
-    -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.responseTimeout=30000
+    -Djcifs.smb.client.soTimeout=35000
+    -Djcifs.smb.client.connTimeout=60000
+    -Djcifs.smb.client.sessionTimeout=60000
     -Dgroovy.use.classvalue=true
     -Dgroovy.use.classvalue=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noKeySetOptimization=true
     -Dio.netty.noKeySetOptimization=true
@@ -1513,9 +1515,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
-    -Djcifs.smb.client.connTimeout=60000
-    -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.responseTimeout=30000
+    -Djcifs.smb.client.soTimeout=35000
+    -Djcifs.smb.client.connTimeout=60000
+    -Djcifs.smb.client.sessionTimeout=60000
     -Dgroovy.use.classvalue=true
     -Dgroovy.use.classvalue=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noKeySetOptimization=true
     -Dio.netty.noKeySetOptimization=true
@@ -1578,9 +1581,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     -XX:+DisableExplicitGC
     -XX:+DisableExplicitGC
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:+HeapDumpOnOutOfMemoryError
     -XX:-OmitStackTraceInFastThrow
     -XX:-OmitStackTraceInFastThrow
-    -Djcifs.smb.client.connTimeout=60000
-    -Djcifs.smb.client.soTimeout=35000
     -Djcifs.smb.client.responseTimeout=30000
     -Djcifs.smb.client.responseTimeout=30000
+    -Djcifs.smb.client.soTimeout=35000
+    -Djcifs.smb.client.connTimeout=60000
+    -Djcifs.smb.client.sessionTimeout=60000
     -Dgroovy.use.classvalue=true
     -Dgroovy.use.classvalue=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noUnsafe=true
     -Dio.netty.noKeySetOptimization=true
     -Dio.netty.noKeySetOptimization=true
@@ -8243,13 +8247,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-server\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseConcMarkSweepGC\n-XX:CMSInitiatingOccupancyFraction=75\n-XX:+UseCMSInitiatingOccupancyOnly\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.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-server\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseConcMarkSweepGC\n-XX:CMSInitiatingOccupancyFraction=75\n-XX:+UseCMSInitiatingOccupancyOnly\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\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-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-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseConcMarkSweepGC\n-XX:CMSInitiatingOccupancyFraction=75\n-XX:+UseCMSInitiatingOccupancyOnly\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\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-server\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseConcMarkSweepGC\n-XX:CMSInitiatingOccupancyFraction=75\n-XX:+UseCMSInitiatingOccupancyOnly\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\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-Xmx128m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseConcMarkSweepGC\n-XX:CMSInitiatingOccupancyFraction=75\n-XX:+UseCMSInitiatingOccupancyOnly\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.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-server\n-Xmx128m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseConcMarkSweepGC\n-XX:CMSInitiatingOccupancyFraction=75\n-XX:+UseCMSInitiatingOccupancyOnly\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\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-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}");

+ 6 - 4
src/main/resources/fess_config.properties

@@ -38,9 +38,10 @@ jvm.crawler.options=\
 -XX:+DisableExplicitGC\n\
 -XX:+DisableExplicitGC\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:-OmitStackTraceInFastThrow\n\
 -XX:-OmitStackTraceInFastThrow\n\
--Djcifs.smb.client.connTimeout=60000\n\
--Djcifs.smb.client.soTimeout=35000\n\
 -Djcifs.smb.client.responseTimeout=30000\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\
 -Dgroovy.use.classvalue=true\n\
 -Dgroovy.use.classvalue=true\n\
 -Dio.netty.noUnsafe=true\n\
 -Dio.netty.noUnsafe=true\n\
 -Dio.netty.noKeySetOptimization=true\n\
 -Dio.netty.noKeySetOptimization=true\n\
@@ -94,9 +95,10 @@ jvm.thumbnail.options=\
 -XX:+DisableExplicitGC\n\
 -XX:+DisableExplicitGC\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:+HeapDumpOnOutOfMemoryError\n\
 -XX:-OmitStackTraceInFastThrow\n\
 -XX:-OmitStackTraceInFastThrow\n\
--Djcifs.smb.client.connTimeout=60000\n\
--Djcifs.smb.client.soTimeout=35000\n\
 -Djcifs.smb.client.responseTimeout=30000\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\
 -Dgroovy.use.classvalue=true\n\
 -Dgroovy.use.classvalue=true\n\
 -Dio.netty.noUnsafe=true\n\
 -Dio.netty.noUnsafe=true\n\
 -Dio.netty.noKeySetOptimization=true\n\
 -Dio.netty.noKeySetOptimization=true\n\