Repository: incubator-samza-hello-samza Updated Branches: refs/heads/latest de4c24b75 -> 6dd08249c
SAMZA-380; use log4j appender in hello-samza Project: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/commit/6dd08249 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/tree/6dd08249 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/diff/6dd08249 Branch: refs/heads/latest Commit: 6dd08249cb9ab6fad67c84346cf53f0703c3a05c Parents: de4c24b Author: Chris Riccomini <[email protected]> Authored: Thu Aug 14 12:30:39 2014 -0700 Committer: Chris Riccomini <[email protected]> Committed: Thu Aug 14 12:30:39 2014 -0700 ---------------------------------------------------------------------- .reviewboardrc | 2 +- pom.xml | 10 ++++++++++ samza-job-package/pom.xml | 6 +++++- samza-job-package/src/main/assembly/src.xml | 1 + samza-job-package/src/main/resources/log4j.xml | 3 +++ 5 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/6dd08249/.reviewboardrc ---------------------------------------------------------------------- diff --git a/.reviewboardrc b/.reviewboardrc index dc119ba..a989cb2 100644 --- a/.reviewboardrc +++ b/.reviewboardrc @@ -19,4 +19,4 @@ REVIEWBOARD_URL = 'https://reviews.apache.org' REPOSITORY = 'samza-hello-samza' GUESS_DESCRIPTION = True TARGET_GROUPS = 'samza' -TRACKING_BRANCH = 'origin/master' +TRACKING_BRANCH = 'origin/latest' http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/6dd08249/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 698fa5b..f38f8f8 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,11 @@ under the License. </dependency> <dependency> <groupId>org.apache.samza</groupId> + <artifactId>samza-log4j</artifactId> + <version>${samza.version}</version> + </dependency> + <dependency> + <groupId>org.apache.samza</groupId> <artifactId>samza-serializers_2.10</artifactId> <version>${samza.version}</version> </dependency> @@ -104,6 +109,11 @@ under the License. <artifactId>jackson-jaxrs</artifactId> <version>1.8.5</version> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>2.4.0</version> + </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/6dd08249/samza-job-package/pom.xml ---------------------------------------------------------------------- diff --git a/samza-job-package/pom.xml b/samza-job-package/pom.xml index 796c439..9de26b5 100644 --- a/samza-job-package/pom.xml +++ b/samza-job-package/pom.xml @@ -51,6 +51,11 @@ under the License. </dependency> <dependency> <groupId>org.apache.samza</groupId> + <artifactId>samza-log4j</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.samza</groupId> <artifactId>samza-serializers_2.10</artifactId> <scope>runtime</scope> </dependency> @@ -82,7 +87,6 @@ under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>2.2.0</version> <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/6dd08249/samza-job-package/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/samza-job-package/src/main/assembly/src.xml b/samza-job-package/src/main/assembly/src.xml index 14a5ad5..0daafcb 100644 --- a/samza-job-package/src/main/assembly/src.xml +++ b/samza-job-package/src/main/assembly/src.xml @@ -69,6 +69,7 @@ <include>org.apache.samza:samza-serializers_2.10</include> <include>org.apache.samza:samza-yarn_2.10</include> <include>org.apache.samza:samza-kv_2.10</include> + <include>org.apache.samza:samza-log4j</include> <include>org.slf4j:slf4j-log4j12</include> <include>samza:samza-wikipedia</include> <include>org.apache.kafka:kafka_2.10</include> http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/6dd08249/samza-job-package/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/samza-job-package/src/main/resources/log4j.xml b/samza-job-package/src/main/resources/log4j.xml index a937165..f0de765 100644 --- a/samza-job-package/src/main/resources/log4j.xml +++ b/samza-job-package/src/main/resources/log4j.xml @@ -22,6 +22,8 @@ <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> + <appender name="jmx" class="org.apache.samza.logging.log4j.JmxAppender" /> + <appender name="RollingAppender" class="org.apache.log4j.DailyRollingFileAppender"> <param name="File" value="${samza.log.dir}/${samza.container.name}.log" /> <param name="DatePattern" value="'.'yyyy-MM-dd" /> @@ -32,5 +34,6 @@ <root> <priority value="info" /> <appender-ref ref="RollingAppender"/> + <appender-ref ref="jmx" /> </root> </log4j:configuration>
