Updated Branches: refs/heads/4.1 3ecec178e -> 2b593dd89
Slightly upgraded memory requirements, with 128M the server will crash after 30 minuted with an OOM on PermGen(cherry picked from commit 1896685d83f88a6fd566697b8e09226fd96a3ac8) Signed-off-by: Hugo Trippaers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b593dd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2b593dd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2b593dd8 Branch: refs/heads/4.1 Commit: 2b593dd89487a009c5c22d70076678f017919566 Parents: 2bc30e8 Author: Hugo Trippaers <[email protected]> Authored: Mon Feb 11 17:18:18 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Feb 11 17:47:12 2013 +0100 ---------------------------------------------------------------------- client/tomcatconf/tomcat6-nonssl.conf.in | 2 +- client/tomcatconf/tomcat6-ssl.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b593dd8/client/tomcatconf/tomcat6-nonssl.conf.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/tomcat6-nonssl.conf.in b/client/tomcatconf/tomcat6-nonssl.conf.in index c9342e0..d69d6ed 100644 --- a/client/tomcatconf/tomcat6-nonssl.conf.in +++ b/client/tomcatconf/tomcat6-nonssl.conf.in @@ -41,7 +41,7 @@ CATALINA_TMPDIR="@MSENVIRON@/temp" # Use JAVA_OPTS to set java.library.path for libtcnative.so #JAVA_OPTS="-Djava.library.path=/usr/lib64" -JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=128M" +JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=256M" # What user should run tomcat TOMCAT_USER="@MSUSER@" http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b593dd8/client/tomcatconf/tomcat6-ssl.conf.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/tomcat6-ssl.conf.in b/client/tomcatconf/tomcat6-ssl.conf.in index ddca44f..ecb93b2 100644 --- a/client/tomcatconf/tomcat6-ssl.conf.in +++ b/client/tomcatconf/tomcat6-ssl.conf.in @@ -40,7 +40,7 @@ CATALINA_TMPDIR="@MSENVIRON@/temp" # Use JAVA_OPTS to set java.library.path for libtcnative.so #JAVA_OPTS="-Djava.library.path=/usr/lib64" -JAVA_OPTS="-Djava.awt.headless=true -Djavax.net.ssl.trustStore=/etc/cloud/management/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=128M" +JAVA_OPTS="-Djava.awt.headless=true -Djavax.net.ssl.trustStore=/etc/cloud/management/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com -Dcom.sun.management.jmxremote.port=45219 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=256M" # What user should run tomcat TOMCAT_USER="@MSUSER@"
