0000914: Update startup scripts to explicitly use the -server option,…

… output out of memory errors, and restart on memory errors
JumpMind · Nov 18, 2012 · d570bd8 · d570bd8
1 parent 9bea31d
commit d570bd8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/symmetric-server/src/main/deploy/bin/sym b/symmetric-server/src/main/deploy/bin/sym
@@ -47,4 +47,4 @@ done
 
 #echo $CLASSPATH
 
-exec "$RUNJAVA" -Dfile.encoding=utf-8 -Duser.language=en -Djava.io.tmpdir=../tmp -Dorg.eclipse.jetty.server.Request.maxFormContentSize=800000 -Dorg.eclipse.jetty.server.Request.maxFormKeys=100000 -Dsym.keystore.file="$PRGDIR/../security/keystore" -Djavax.net.ssl.trustStore="$PRGDIR/../security/cacerts" -Dsun.net.client.defaultReadTimeout=1800000 -Dsun.net.client.defaultConnectTimeout=1800000 -Dlog4j.configuration=$LOG4JXML -cp $CLASSPATH org.jumpmind.symmetric.SymmetricLauncher "$@"
+exec "$RUNJAVA" -server -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=../tmp -Dfile.encoding=utf-8 -Duser.language=en -Djava.io.tmpdir=../tmp -Dorg.eclipse.jetty.server.Request.maxFormContentSize=800000 -Dorg.eclipse.jetty.server.Request.maxFormKeys=100000 -Dsym.keystore.file="$PRGDIR/../security/keystore" -Djavax.net.ssl.trustStore="$PRGDIR/../security/cacerts" -Dsun.net.client.defaultReadTimeout=1800000 -Dsun.net.client.defaultConnectTimeout=1800000 -Dlog4j.configuration=$LOG4JXML -cp $CLASSPATH org.jumpmind.symmetric.SymmetricLauncher "$@"
diff --git a/symmetric-server/src/main/deploy/bin/sym.bat b/symmetric-server/src/main/deploy/bin/sym.bat
@@ -11,4 +11,4 @@ for %%i in ("%HOMEDIR%\web\WEB-INF\lib\*.jar") do call "%PRGDIR%cpappend.bat" %%
 
 rem echo CLASSPATH=%CLASSPATH%
 
-java -Dfile.encoding=utf-8 -Duser.language=en -Djava.io.tmpdir=../tmp -Dorg.eclipse.jetty.server.Request.maxFormContentSize=800000 -Dorg.eclipse.jetty.server.Request.maxFormKeys=100000 -Dsym.keystore.file="%HOMEDIR%\security\keystore" -Djavax.net.ssl.trustStore="%HOMEDIR%\security\cacerts" -Dlog4j.configuration="file:%CONFDIR%\log4j.xml" -Dsun.net.client.defaultReadTimeout=1800000 -Dsun.net.client.defaultConnectTimeout=1800000 org.jumpmind.symmetric.SymmetricLauncher %1 %2 %3 %4 %5 %6 %7 %8 %9
+java  -server -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=../tmp -Dfile.encoding=utf-8 -Duser.language=en -Djava.io.tmpdir=../tmp -Dorg.eclipse.jetty.server.Request.maxFormContentSize=800000 -Dorg.eclipse.jetty.server.Request.maxFormKeys=100000 -Dsym.keystore.file="%HOMEDIR%\security\keystore" -Djavax.net.ssl.trustStore="%HOMEDIR%\security\cacerts" -Dlog4j.configuration="file:%CONFDIR%\log4j.xml" -Dsun.net.client.defaultReadTimeout=1800000 -Dsun.net.client.defaultConnectTimeout=1800000 org.jumpmind.symmetric.SymmetricLauncher %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/symmetric-server/src/main/deploy/conf/sym_service.conf b/symmetric-server/src/main/deploy/conf/sym_service.conf
@@ -44,6 +44,9 @@ wrapper.java.additional.6=-Djava.io.tmpdir=../tmp
 wrapper.java.additional.7=-Dsun.net.client.defaultReadTimeout=1800000 
 wrapper.java.additional.8=-Dsun.net.client.defaultConnectTimeout=1800000
 wrapper.java.additional.9=-Dfile.encoding=utf-8
+wrapper.java.additional.10=-XX:+HeapDumpOnOutOfMemoryError
+wrapper.java.additional.11=-XX:HeapDumpPath=../tmp
+wrapper.java.additional.12=-server
 
 # Initial Java Heap Size (in MB)
 wrapper.java.initmemory=256
@@ -127,3 +130,7 @@ wrapper.ntservice.starttype=AUTO_START
 # Allow the service to interact with the desktop.
 wrapper.ntservice.interactive=false
 
+wrapper.filter.trigger.1=java.lang.OutOfMemoryError
+
+wrapper.filter.action.1=RESTART
+