flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject flink git commit: [FLINK-5504] Create mesos-appmaster log file in log directory
Date Mon, 23 Jan 2017 12:34:41 GMT
Repository: flink
Updated Branches:
  refs/heads/master 16d33d0dd -> 43eee9002


[FLINK-5504] Create mesos-appmaster log file in log directory

This PR prepends the FLINK_LOG_DIR env variable pointing to Flink's logging
directory to the logging file name.

This closes #3159.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/43eee900
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/43eee900
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/43eee900

Branch: refs/heads/master
Commit: 43eee9002d7eb02297b47faba069f7cf39e8a5db
Parents: 16d33d0d
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Wed Jan 18 16:53:42 2017 +0100
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Mon Jan 23 13:34:06 2017 +0100

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/43eee900/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
index d65c6b0..882b666 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
@@ -38,9 +38,13 @@ constructAppMasterClassPath() {
     echo $CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS
 }
 
+if [ "$FLINK_IDENT_STRING" = "" ]; then
+    FLINK_IDENT_STRING="$USER"
+fi
+
 CC_CLASSPATH=`manglePathList $(constructAppMasterClassPath)`
 
-log=flink-appmaster.log
+log="${FLINK_LOG_DIR}/flink-${FLINK_IDENT_STRING}-mesos-appmaster-${HOSTNAME}.log"
 log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml"
 
 export FLINK_CONF_DIR


Mime
View raw message