[flink] branch master updated: [FLINK-16798][scripts] Properly forward BashJavaUtils logging output

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new fbfb639  [FLINK-16798][scripts] Properly forward BashJavaUtils logging output
fbfb639 is described below

commit fbfb639e500e7cfa06485f1328671cfe645dfd76
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Mar 27 12:18:17 2020 +0100

    [FLINK-16798][scripts] Properly forward BashJavaUtils logging output
---
 flink-dist/src/main/flink-bin/bin/taskmanager.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index befeb99..4ffceb0 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -48,7 +48,9 @@ if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
 
     # Startup parameters
 
-    params_output=$(runBashJavaUtilsCmd GET_TM_RESOURCE_PARAMS ${FLINK_CONF_DIR} | tail -n 2)
+    java_utils_output=$(runBashJavaUtilsCmd GET_TM_RESOURCE_PARAMS ${FLINK_CONF_DIR})
+    logging_output=$(echo "${java_utils_output}" | head -n -2)
+    params_output=$(echo "${java_utils_output}" | tail -n 2)
 
     jvm_params=$(extractExecutionParams "$(echo "$params_output" | head -n 1)")
     if [[ $? -ne 0 ]]; then
@@ -72,6 +74,7 @@ $FLINK_INHERITED_LOGS
 TM_RESOURCE_PARAMS extraction logs:
 jvm_params: $jvm_params
 dynamic_configs: $dynamic_configs
+logs: $logging_output
 "
 fi