[flink] 01/24: [hotfix] Make logging flags explicit

[kkloudas]

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

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

commit 318c4add45235d63045c4986cec1372891589a5c
Author: Kostas Kloudas <kklou...@gmail.com>
AuthorDate: Thu Nov 7 13:01:52 2019 +0100

    [hotfix] Make logging flags explicit
---
 .../src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java 
b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
index 72f6778..ae59d92 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
@@ -950,10 +950,13 @@ public class YarnClusterDescriptor implements 
ClusterDescriptor<ApplicationId> {
                                        "");
                }
 
+               final boolean hasLogback = logConfigFilePath != null && 
logConfigFilePath.endsWith(CONFIG_FILE_LOGBACK_NAME);
+               final boolean hasLog4j = logConfigFilePath != null && 
logConfigFilePath.endsWith(CONFIG_FILE_LOG4J_NAME);
+
                final ContainerLaunchContext amContainer = 
setupApplicationMasterContainer(
                                yarnClusterEntrypoint,
-                               logConfigFilePath != null && 
logConfigFilePath.endsWith(CONFIG_FILE_LOGBACK_NAME),
-                               logConfigFilePath != null && 
logConfigFilePath.endsWith(CONFIG_FILE_LOG4J_NAME),
+                               hasLogback,
+                               hasLog4j,
                                hasKrb5,
                                clusterSpecification.getMasterMemoryMB());