dawidwys closed pull request #7371: [FLINK-11224][scala-shell] Log is missing
in scala-shell
URL: https://github.com/apache/flink/pull/7371
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-scala-shell/start-script/start-scala-shell.sh
b/flink-scala-shell/start-script/start-scala-shell.sh
index e3571145f13..2a5d4f14699 100644
--- a/flink-scala-shell/start-script/start-scala-shell.sh
+++ b/flink-scala-shell/start-script/start-scala-shell.sh
@@ -82,15 +82,26 @@ do
fi
done
-log_setting=""
+if [ "$FLINK_IDENT_STRING" = "" ]; then
+ FLINK_IDENT_STRING="$USER"
+fi
+
+MODE=$1
+LOG=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-scala-shell-$MODE-$HOSTNAME.log
-if [[ $1 = "yarn" ]]
+if [[ ($MODE = "local") || ($MODE = "remote") ]]
then
-FLINK_CLASSPATH=$FLINK_CLASSPATH:$HADOOP_CLASSPATH:$HADOOP_CONF_DIR:$YARN_CONF_DIR
-log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-scala-shell-yarn-$HOSTNAME.log
-log_setting="-Dlog.file="$log"
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-yarn-session.properties
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-yarn.xml"
+ LOG4J_CONFIG=log4j.properties
+ LOGBACK_CONFIG=logback.xml
+elif [[ $1 = "yarn" ]]
+then
+ LOG4J_CONFIG=log4j-yarn-session.properties
+ LOGBACK_CONFIG=logback-yarn.xml
+
FLINK_CLASSPATH=$FLINK_CLASSPATH:$HADOOP_CLASSPATH:$HADOOP_CONF_DIR:$YARN_CONF_DIR
fi
+log_setting="-Dlog.file="$LOG"
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/$LOG4J_CONFIG
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/$LOGBACK_CONFIG"
+
if ${EXTERNAL_LIB_FOUND}
then
java -Dscala.color -cp "$FLINK_CLASSPATH" $log_setting
org.apache.flink.api.scala.FlinkShell $@ --addclasspath "$EXT_CLASSPATH"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
