You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/03/03 16:23:14 UTC
[2/9] lucene-solr git commit: SOLR-8145: Fix position of OOM killer
script when starting Solr in the background (cherry picked from commit
e1033d9)
SOLR-8145: Fix position of OOM killer script when starting Solr in the background
(cherry picked from commit e1033d9)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cc8af0d3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cc8af0d3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cc8af0d3
Branch: refs/heads/branch_6_0
Commit: cc8af0d3e8e9bbd933947dae7307d0b09eb146da
Parents: 3a96ed9
Author: thelabdude <th...@gmail.com>
Authored: Wed Mar 2 23:52:27 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Mar 3 20:48:21 2016 +0530
----------------------------------------------------------------------
solr/bin/solr | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cc8af0d3/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