add java-tron.vmoption for configure jvm option

Yrp · Yrp · commit 28ca4ceb70c2 · 2019-11-08T11:59:08.000+08:00
diff --git a/framework/build.gradle b/framework/build.gradle
@@ -208,11 +208,7 @@ def binaryRelease(taskName, jarName, mainClass) {
         }
     }
 }
-startScripts {
-    doLast {
-        delete unixScript
-    }
-}
+
 def createScript(project, mainClass, name) {
     project.tasks.create(name: name, type: CreateStartScripts) {
         unixStartScriptGenerator.template = resources.text.fromFile('../gradle/unixStartScript.txt')
@@ -221,14 +217,14 @@ def createScript(project, mainClass, name) {
         mainClassName   = mainClass
         applicationName = name
         classpath       = project.tasks[JavaPlugin.JAR_TASK_NAME].outputs.files + project.configurations.runtime
-        defaultJvmOpts = ['-XX:+UseConcMarkSweepGC',
-                          '-XX:+PrintGCDetails',
-                          '-Xloggc:./gc.log',
-                          '-XX:+PrintGCDateStamps',
-                          '-XX:+CMSParallelRemarkEnabled',
-                          '-XX:ReservedCodeCacheSize=256m',
-                          '-XX:+CMSScavengeBeforeRemark'
-        ]
+//        defaultJvmOpts = ['-XX:+UseConcMarkSweepGC',
+//                          '-XX:+PrintGCDetails',
+//                          '-Xloggc:./gc.log',
+//                          '-XX:+PrintGCDateStamps',
+//                          '-XX:+CMSParallelRemarkEnabled',
+//                          '-XX:ReservedCodeCacheSize=256m',
+//                          '-XX:+CMSScavengeBeforeRemark'
+//        ]
     }
     project.tasks[name].dependsOn(project.jar)
     project.applicationDistribution.with {
@@ -238,7 +234,9 @@ def createScript(project, mainClass, name) {
         }
     }
 }
-
+applicationDistribution.from("../gradle/java-tron.vmoptions") {
+    into "bin"
+}
 //distZip {
 //    doLast {
 //        file("$destinationDir/$archiveName").renameTo("$destinationDir/"+'java-tron-'+version+'-bin.zip')
diff --git a/gradle/unixStartScript.txt b/gradle/unixStartScript.txt
@@ -43,15 +43,19 @@ cd "\$SAVED" >/dev/null
 APP_NAME="${applicationName}"
 APP_BASE_NAME=`basename "\$0"`
 
-UNAME=\$(uname -s)
-if [ x"\$UNAME" == x"Linux" ];then
-    TOTAL=\$(cat /proc/meminfo  |grep MemTotal |awk -F ' ' '{print \$2}')
-    MEM=\$(echo "\$TOTAL/1024/1024*0.8" | bc |awk -F. '{print \$1"g"}')
-    JAVA_OPTS='"-Xmx\$MEM" "-Xms\$MEM"'
-fi
+#UNAME=\$(uname -s)
+#if [ x"\$UNAME" == x"Linux" ];then
+#    TOTAL=\$(cat /proc/meminfo  |grep MemTotal |awk -F ' ' '{print \$2}')
+#    MEM=\$(echo "\$TOTAL/1024/1024*0.8" | bc |awk -F. '{print \$1"g"}')
+#    JAVA_OPTS='"-Xmx\$MEM" "-Xms\$MEM"'
+#fi
 
 # Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
 DEFAULT_JVM_OPTS=${defaultJvmOpts}
+for line in \$(cat \$APP_HOME/bin/java-tron.vmoptions)
+do
+    DEFAULT_JVM_OPTS="\$DEFAULT_JVM_OPTS \$line"
+done
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
