You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2016/03/02 19:24:42 UTC
lucene-solr git commit: SOLR-8145: Fix position of OOM killer script
when starting Solr in the background
Repository: lucene-solr
Updated Branches:
refs/heads/master e3198cac5 -> 80801a273
SOLR-8145: Fix position of OOM killer script when starting Solr in the background
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/80801a27
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/80801a27
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/80801a27
Branch: refs/heads/master
Commit: 80801a2738c10ace30eca549fe5daadb88989c32
Parents: e3198ca
Author: thelabdude <th...@gmail.com>
Authored: Wed Mar 2 11:22:27 2016 -0700
Committer: thelabdude <th...@gmail.com>
Committed: Wed Mar 2 11:22:27 2016 -0700
----------------------------------------------------------------------
solr/bin/solr | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/80801a27/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 904c2c3..9cf8ae5 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1420,8 +1420,9 @@ function launch_solr() {
exec "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar "${SOLR_JETTY_CONFIG[@]}"
else
# run Solr in the background
- nohup "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar \
- "-XX:OnOutOfMemoryError=$SOLR_TIP/bin/oom_solr.sh $SOLR_PORT $SOLR_LOGS_DIR" "${SOLR_JETTY_CONFIG[@]}" \
+ nohup "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS \
+ "-XX:OnOutOfMemoryError=$SOLR_TIP/bin/oom_solr.sh $SOLR_PORT $SOLR_LOGS_DIR" \
+ -jar start.jar "${SOLR_JETTY_CONFIG[@]}" \
1>"$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log" 2>&1 & echo $! > "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
# no lsof on cygwin though