diff options
| author | Per Andersson <avtobiff@gmail.com> | 2010-04-17 19:18:34 +0200 |
|---|---|---|
| committer | Per Andersson <avtobiff@gmail.com> | 2010-04-17 19:18:34 +0200 |
| commit | c7c6d9a54da8c5cc2e31f674f37ab6644d9694f6 (patch) | |
| tree | ed793e97bfc8ddd5dda8a7234ecc7292b9d7f98b | |
| parent | 300ef2b59f971ec113145f61479fd83fcc21399e (diff) | |
| download | etherpad-c7c6d9a54da8c5cc2e31f674f37ab6644d9694f6.tar.gz etherpad-c7c6d9a54da8c5cc2e31f674f37ab6644d9694f6.tar.xz etherpad-c7c6d9a54da8c5cc2e31f674f37ab6644d9694f6.zip | |
corrections and additions to init script defaults.
* corrected classpath so it has the correct path.
* added missing and corrected erroneus options passed to java.
| -rw-r--r-- | etherpad/bin/etherpad.default | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/etherpad/bin/etherpad.default b/etherpad/bin/etherpad.default index 1943cdc..dcceea9 100644 --- a/etherpad/bin/etherpad.default +++ b/etherpad/bin/etherpad.default @@ -17,8 +17,8 @@ MYSQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar MXRAM="1G" # Classpath -CP="appjet-eth-dev.jar:data" -for f in "$ETHERPAD_HOME/etherpad/lib/*.jar"; do +CP="$ETHERPAD_HOME/etherpad/appjet-eth-dev.jar:$ETHERPAD_HOME/etherpad/data" +for f in "$ETHERPAD_HOME"/etherpad/lib/*.jar; do CP="$CP:$f" done @@ -35,11 +35,12 @@ ETHERPAD_OPTS="-classpath $CP \ -Xms${MXRAM} \ -Djava.awt.headless=true \ -XX:MaxGCPauseMillis=500 \ - -XX:+UseConcorMarkSweepGC \ + -XX:+UseConcMarkSweepGC \ + -XX:+CMSIncrementalMode \ -XX:CMSIncrementalSafetyFactor=50 \ -XX:+PrintGCDetails \ -XX:+PrintGCTimeStamps \ - -Xloggc:./data/logs/backend/jvm-gc.log \ + -Xloggc:$ETHERPAD_HOME/etherpad/data/logs/backend/jvm-gc.log \ -Dappjet.jmxremote=true \ $JAVA_OPTS \ net.appjet.oui.main \ |