You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/09/20 00:22:12 UTC
[1/5] git commit: Fix compiler warning: exception not thrown.
Repository: logging-log4j2
Updated Branches:
refs/heads/master d87f7ff02 -> 222a4c7a0
Fix compiler warning: exception not thrown.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/226a0312
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/226a0312
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/226a0312
Branch: refs/heads/master
Commit: 226a03120b0e6bf0c2fd8031e13e55633f73d943
Parents: d87f7ff
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 19 18:19:52 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 19 18:19:52 2014 -0400
----------------------------------------------------------------------
.../log4j/flume/appender/FlumeEmbeddedAppenderTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/226a0312/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
index 5cbcee0..b1f3a2e 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
@@ -126,7 +126,7 @@ public class FlumeEmbeddedAppenderTest {
}
@Test
- public void testLog4Event() throws InterruptedException, IOException {
+ public void testLog4Event() throws IOException {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Log4j", "Test");
EventLogger.logEvent(msg);
@@ -139,7 +139,7 @@ public class FlumeEmbeddedAppenderTest {
}
@Test
- public void testMultiple() throws InterruptedException, IOException {
+ public void testMultiple() throws IOException {
for (int i = 0; i < 10; ++i) {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Multiple " + i, "Test");
@@ -196,7 +196,7 @@ public class FlumeEmbeddedAppenderTest {
}
/* Flume 1.4.0 does not support interceptors on the embedded agent
@Test */
- public void testHeaderAddedByInterceptor() throws InterruptedException, IOException {
+ public void testHeaderAddedByInterceptor() {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Log4j", "Test");
EventLogger.logEvent(msg);
[2/5] git commit: Statement does not need to be nested.
Posted by gg...@apache.org.
Statement does not need to be nested.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/059feef6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/059feef6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/059feef6
Branch: refs/heads/master
Commit: 059feef67c0feb015ad449db233cc6fc0d7301ab
Parents: 226a031
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 19 18:20:15 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 19 18:20:15 2014 -0400
----------------------------------------------------------------------
.../logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/059feef6/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
index b1f3a2e..44b71b7 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
@@ -276,9 +276,8 @@ public class FlumeEmbeddedAppenderTest {
if (avroEvent != null) {
return EventBuilder.withBody(avroEvent.getBody().array(),
toStringMap(avroEvent.getHeaders()));
- } else {
- System.out.println("No Event returned");
}
+ System.out.println("No Event returned");
return null;
}
[3/5] git commit: Format.
Posted by gg...@apache.org.
Format.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/adfd6365
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/adfd6365
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/adfd6365
Branch: refs/heads/master
Commit: adfd63651b9e384ef78a0c652ded099dc72fde8e
Parents: 059feef
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 19 18:20:29 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 19 18:20:29 2014 -0400
----------------------------------------------------------------------
.../logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/adfd6365/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
index 44b71b7..4e26f34 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
@@ -274,8 +274,7 @@ public class FlumeEmbeddedAppenderTest {
// Ignore the exception.
}
if (avroEvent != null) {
- return EventBuilder.withBody(avroEvent.getBody().array(),
- toStringMap(avroEvent.getHeaders()));
+ return EventBuilder.withBody(avroEvent.getBody().array(), toStringMap(avroEvent.getHeaders()));
}
System.out.println("No Event returned");
return null;
[5/5] git commit: Statement does not need to be nested.
Posted by gg...@apache.org.
Statement does not need to be nested.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/222a4c7a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/222a4c7a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/222a4c7a
Branch: refs/heads/master
Commit: 222a4c7a0fd08af17d0a4a0f0bebf1f594d4d2e4
Parents: 4dc3ddc
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 19 18:22:07 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 19 18:22:07 2014 -0400
----------------------------------------------------------------------
.../logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/222a4c7a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
index e4c7b52..4b15258 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
@@ -250,9 +250,8 @@ public class FlumeEmbeddedAgentTest {
if (avroEvent != null) {
return EventBuilder.withBody(avroEvent.getBody().array(),
toStringMap(avroEvent.getHeaders()));
- } else {
- System.out.println("No Event returned");
}
+ System.out.println("No Event returned");
return null;
}
[4/5] git commit: Fix compiler warning: exception not thrown.
Posted by gg...@apache.org.
Fix compiler warning: exception not thrown.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4dc3ddcc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4dc3ddcc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4dc3ddcc
Branch: refs/heads/master
Commit: 4dc3ddcc1ccc5f0e4b3b9f392c63c2072be6512a
Parents: adfd636
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 19 18:21:42 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 19 18:21:42 2014 -0400
----------------------------------------------------------------------
.../log4j/flume/appender/FlumeEmbeddedAgentTest.java | 4 ++--
.../flume/appender/FlumePersistentAppenderTest.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4dc3ddcc/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
index ef635cd..e4c7b52 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
@@ -126,7 +126,7 @@ public class FlumeEmbeddedAgentTest {
}
@Test
- public void testLog4Event() throws InterruptedException, IOException {
+ public void testLog4Event() throws IOException {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Log4j", "Test");
EventLogger.logEvent(msg);
@@ -139,7 +139,7 @@ public class FlumeEmbeddedAgentTest {
}
@Test
- public void testMultiple() throws InterruptedException, IOException {
+ public void testMultiple() throws IOException {
for (int i = 0; i < 10; ++i) {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Multiple " + i, "Test");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4dc3ddcc/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
index a9ae9c6..2fa1689 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
@@ -128,7 +128,7 @@ public class FlumePersistentAppenderTest {
}
@Test
- public void testLog4Event() throws InterruptedException, IOException {
+ public void testLog4Event() throws IOException {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Log4j", "Test");
EventLogger.logEvent(msg);
@@ -141,7 +141,7 @@ public class FlumePersistentAppenderTest {
}
@Test
- public void testMultiple() throws InterruptedException, IOException {
+ public void testMultiple() {
for (int i = 0; i < 10; ++i) {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Multiple " + i, "Test");
@@ -168,7 +168,7 @@ public class FlumePersistentAppenderTest {
@Test
- public void testFailover() throws InterruptedException, IOException {
+ public void testFailover() throws InterruptedException {
final Logger logger = LogManager.getLogger("testFailover");
logger.debug("Starting testFailover");
for (int i = 0; i < 10; ++i) {
@@ -222,7 +222,7 @@ public class FlumePersistentAppenderTest {
}
@Test
- public void testSingle() throws InterruptedException, IOException {
+ public void testSingle() throws IOException {
final Logger logger = LogManager.getLogger("EventLogger");
final Marker marker = MarkerManager.getMarker("EVENT");
@@ -236,7 +236,7 @@ public class FlumePersistentAppenderTest {
}
@Test
- public void testMultipleConcurrent() throws InterruptedException, IOException {
+ public void testMultipleConcurrent() throws InterruptedException {
final int eventsCount = 10000;
@@ -278,7 +278,7 @@ public class FlumePersistentAppenderTest {
}
@Test
- public void testRFC5424Layout() throws InterruptedException, IOException {
+ public void testRFC5424Layout() throws IOException {
final StructuredDataMessage msg = new StructuredDataMessage("Test", "Test Log4j", "Test");
EventLogger.logEvent(msg);