This is an automated email from the ASF dual-hosted git repository. epugh pushed a commit to branch revert-1924-SOLR-16981-solr-stop in repository https://gitbox.apache.org/repos/asf/solr.git
commit 404b48861dbe734341a7554bffea9a676f5cbbbd Author: Eric Pugh <[email protected]> AuthorDate: Fri Sep 15 07:07:51 2023 -0400 Revert "SOLR-16981: bin/solr stop withuot argument should behave the same even if SOLR_PORT is set (#1924)" This reverts commit 6f4cf56c83f563deb6d03e47223c3a7bbcc31a5c. --- solr/bin/solr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solr/bin/solr b/solr/bin/solr old mode 100755 new mode 100644 index a532fc7ca58..cc72f621094 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -147,6 +147,8 @@ fi : "${SOLR_STOP_WAIT:=180}" : "${SOLR_START_WAIT:=$SOLR_STOP_WAIT}" # defaulting to $SOLR_STOP_WAIT for backwards compatibility reasons +# Store whether a solr port was explicitly provided, for the "solr stop" command. +PROVIDED_SOLR_PORT="${SOLR_PORT:-}" : "${SOLR_PORT:=8983}" export SOLR_PORT @@ -410,7 +412,7 @@ function print_usage() { echo "" elif [ "$CMD" == "stop" ]; then echo "" - echo "Usage: solr stop [-k key] [-p port] [-all] [-V]" + echo "Usage: solr stop [-k key] [-p port] [-V]" echo "" echo " -k <key> Stop key; default is solrrocks" echo ""
