tisonkun commented on code in PR #16251: URL: https://github.com/apache/pulsar/pull/16251#discussion_r917344200
########## bin/pulsar-shell: ########## @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +BINDIR=$(dirname "$0") +export PULSAR_HOME=`cd -P $BINDIR/..;pwd` +. "$PULSAR_HOME/bin/pulsar-admin-common.sh" +OPTS="-Dorg.jline.terminal.jansi=false $OPTS" + +#Change to PULSAR_HOME to support relative paths +cd "$PULSAR_HOME" Review Comment: Well. It seems we parse other arguments in https://github.com/apache/pulsar/pull/16332/commits/58d23226f61e75682361ea6d746091efd7a606e1. Perhaps we can add these lines there but it's not a requirement. ########## bin/pulsar-client: ########## @@ -19,105 +19,9 @@ # BINDIR=$(dirname "$0") -PULSAR_HOME=`cd -P $BINDIR/..;pwd` - -DEFAULT_CLIENT_CONF=$PULSAR_HOME/conf/client.conf -DEFAULT_LOG_CONF=$PULSAR_HOME/conf/log4j2.yaml - -if [ -f "$PULSAR_HOME/conf/pulsar_tools_env.sh" ] -then - . "$PULSAR_HOME/conf/pulsar_tools_env.sh" -fi - -# Check for the java to use -if [[ -z $JAVA_HOME ]]; then - JAVA=$(which java) - if [ $? != 0 ]; then - echo "Error: JAVA_HOME not set, and no java executable found in $PATH." 1>&2 - exit 1 - fi -else - JAVA=$JAVA_HOME/bin/java -fi - -# exclude tests jar -RELEASE_JAR=`ls $PULSAR_HOME/pulsar-*.jar 2> /dev/null | grep -v tests | tail -1` -if [ $? == 0 ]; then - PULSAR_JAR=$RELEASE_JAR -fi - -# exclude tests jar -BUILT_JAR=`ls $PULSAR_HOME/pulsar-client-tools/target/pulsar-*.jar 2> /dev/null | grep -v tests | tail -1` -if [ $? != 0 ] && [ ! -e "$PULSAR_JAR" ]; then - echo "\nCouldn't find pulsar jar."; - echo "Make sure you've run 'mvn package'\n"; - exit 1; -elif [ -e "$BUILT_JAR" ]; then - PULSAR_JAR=$BUILT_JAR -fi - -add_maven_deps_to_classpath() { - MVN="mvn" - if [ "$MAVEN_HOME" != "" ]; then - MVN=${MAVEN_HOME}/bin/mvn - fi - - # Need to generate classpath from maven pom. This is costly so generate it - # and cache it. Save the file into our target dir so a mvn clean will get - # clean it up and force us create a new one. - f="${PULSAR_HOME}/distribution/server/target/classpath.txt" - if [ ! -f "${f}" ] - then - ( - cd "${PULSAR_HOME}" - ${MVN} -pl distribution/server generate-sources &> /dev/null - ) - fi - PULSAR_CLASSPATH=${CLASSPATH}:`cat "${f}"` -} - -if [ -d "$PULSAR_HOME/lib" ]; then - PULSAR_CLASSPATH="$PULSAR_CLASSPATH:$PULSAR_HOME/lib/*" -else - add_maven_deps_to_classpath -fi - -if [ -z "$PULSAR_CLIENT_CONF" ]; then - PULSAR_CLIENT_CONF=$DEFAULT_CLIENT_CONF -fi -if [ -z "$PULSAR_LOG_CONF" ]; then - PULSAR_LOG_CONF=$DEFAULT_LOG_CONF -fi - -PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH" -PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH" -OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`" -OPTS="$OPTS -Djava.net.preferIPv4Stack=true" - -IS_JAVA_8=`$JAVA -version 2>&1 |grep version|grep '"1\.8'` -# Start --add-opens options -# '--add-opens' option is not supported in jdk8 -if [[ -z "$IS_JAVA_8" ]]; then - OPTS="$OPTS --add-opens java.base/sun.net=ALL-UNNAMED" -fi - -OPTS="-cp $PULSAR_CLASSPATH $OPTS" - -OPTS="$OPTS $PULSAR_EXTRA_OPTS" - -# log directory & file -PULSAR_LOG_DIR=${PULSAR_LOG_DIR:-"$PULSAR_HOME/logs"} -PULSAR_LOG_APPENDER=${PULSAR_LOG_APPENDER:-"Console"} Review Comment: Good to deduplicate shell scripts. I can see that in `pulsar-admin-common.sh` the default appender is `RoutingAppender` with `pulsar.routing.appender.default=Console`. Does it affect user experience? ########## bin/pulsar-shell: ########## @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +BINDIR=$(dirname "$0") +export PULSAR_HOME=`cd -P $BINDIR/..;pwd` +. "$PULSAR_HOME/bin/pulsar-admin-common.sh" +OPTS="-Dorg.jline.terminal.jansi=false $OPTS" + +#Change to PULSAR_HOME to support relative paths +cd "$PULSAR_HOME" Review Comment: Why do we need this line? It seems the `$PULSAR_CLIENT_CONF` is set as absolute path. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
