Repository: samza Updated Branches: refs/heads/master 2b7c0bdd5 -> a29f2fb22
SAMZA-994: fix StreamAppender start up issue w/ refactored JobCoordinator Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/a29f2fb2 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/a29f2fb2 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/a29f2fb2 Branch: refs/heads/master Commit: a29f2fb22eb84201e0e3b3144bf434f4c534ef93 Parents: 2b7c0bd Author: Jagadish Venkatraman <[email protected]> Authored: Mon Aug 8 09:45:21 2016 -0700 Committer: Yi Pan (Data Infrastructure) <[email protected]> Committed: Mon Aug 8 09:45:21 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/samza/logging/log4j/StreamAppender.java | 4 ++-- .../java/org/apache/samza/logging/log4j/TestStreamAppender.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/a29f2fb2/samza-log4j/src/main/java/org/apache/samza/logging/log4j/StreamAppender.java ---------------------------------------------------------------------- diff --git a/samza-log4j/src/main/java/org/apache/samza/logging/log4j/StreamAppender.java b/samza-log4j/src/main/java/org/apache/samza/logging/log4j/StreamAppender.java index ca4eb7f..5b532bc 100644 --- a/samza-log4j/src/main/java/org/apache/samza/logging/log4j/StreamAppender.java +++ b/samza-log4j/src/main/java/org/apache/samza/logging/log4j/StreamAppender.java @@ -53,7 +53,7 @@ import org.apache.samza.util.Util; public class StreamAppender extends AppenderSkeleton { private static final String JAVA_OPTS_CONTAINER_NAME = "samza.container.name"; - private static final String APPLICATION_MASTER_TAG = "samza-application-master"; + private static final String JOB_COORDINATOR_TAG = "samza-job-coordinator"; private static final String SOURCE = "log4j-log"; private Config config = null; private SystemStream systemStream = null; @@ -82,7 +82,7 @@ public class StreamAppender extends AppenderSkeleton { public void activateOptions() { String containerName = System.getProperty(JAVA_OPTS_CONTAINER_NAME); if (containerName != null) { - isApplicationMaster = containerName.contains(APPLICATION_MASTER_TAG); + isApplicationMaster = containerName.contains(JOB_COORDINATOR_TAG); } else { throw new SamzaException("Got null container name from system property: " + JAVA_OPTS_CONTAINER_NAME + ". This is used as the key for the log appender, so can't proceed."); http://git-wip-us.apache.org/repos/asf/samza/blob/a29f2fb2/samza-log4j/src/test/java/org/apache/samza/logging/log4j/TestStreamAppender.java ---------------------------------------------------------------------- diff --git a/samza-log4j/src/test/java/org/apache/samza/logging/log4j/TestStreamAppender.java b/samza-log4j/src/test/java/org/apache/samza/logging/log4j/TestStreamAppender.java index e2e17a0..59669b7 100644 --- a/samza-log4j/src/test/java/org/apache/samza/logging/log4j/TestStreamAppender.java +++ b/samza-log4j/src/test/java/org/apache/samza/logging/log4j/TestStreamAppender.java @@ -95,7 +95,7 @@ public class TestStreamAppender { @Test public void testSystemProducerAppenderInAM() { - System.setProperty("samza.container.name", "samza-application-master"); + System.setProperty("samza.container.name", "samza-job-coordinator"); MockSystemProducerAppender systemProducerAppender = new MockSystemProducerAppender(); PatternLayout layout = new PatternLayout();
