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/06/25 06:05:50 UTC
svn commit: r1605248 -
/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/
Author: ggregory
Date: Wed Jun 25 04:05:50 2014
New Revision: 1605248
URL: http://svn.apache.org/r1605248
Log:
Refactor duplicate code into a new class: FreePortFinder.
Added:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java (with props)
Modified:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java?rev=1605248&r1=1605247&r2=1605248&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java Wed Jun 25 04:05:50 2014
@@ -95,7 +95,7 @@ public class FlumeEmbeddedAgentTest {
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = findFreePorts(2);
+ final int[] ports = FreePortFinder.findFreePorts(2);
System.setProperty("primaryPort", Integer.toString(ports[0]));
System.setProperty("alternatePort", Integer.toString(ports[1]));
primary = new EventCollector(ports[0]);
@@ -276,26 +276,4 @@ public class FlumeEmbeddedAgentTest {
}
return stringMap;
}
-
- private static int[] findFreePorts(final int count) throws IOException {
- final int[] ports = new int[count];
- final ServerSocket[] sockets = new ServerSocket[count];
- try {
- for (int i = 0; i < count; ++i) {
- sockets[i] = new ServerSocket(0);
- ports[i] = sockets[i].getLocalPort();
- }
- } finally {
- for (int i = 0; i < count; ++i) {
- if (sockets[i] != null) {
- try {
- sockets[i].close();
- } catch (final Exception ex) {
- // Ignore the error.
- }
- }
- }
- }
- return ports;
- }
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java?rev=1605248&r1=1605247&r2=1605248&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java Wed Jun 25 04:05:50 2014
@@ -95,7 +95,7 @@ public class FlumeEmbeddedAppenderTest {
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = findFreePorts(2);
+ final int[] ports = FreePortFinder.findFreePorts(2);
System.setProperty("primaryPort", Integer.toString(ports[0]));
System.setProperty("alternatePort", Integer.toString(ports[1]));
primary = new EventCollector(ports[0]);
@@ -302,26 +302,4 @@ public class FlumeEmbeddedAppenderTest {
}
return stringMap;
}
-
- private static int[] findFreePorts(final int count) throws IOException {
- final int[] ports = new int[count];
- final ServerSocket[] sockets = new ServerSocket[count];
- try {
- for (int i = 0; i < count; ++i) {
- sockets[i] = new ServerSocket(0);
- ports[i] = sockets[i].getLocalPort();
- }
- } finally {
- for (int i = 0; i < count; ++i) {
- if (sockets[i] != null) {
- try {
- sockets[i].close();
- } catch (final Exception ex) {
- // Ignore the error.
- }
- }
- }
- }
- return ports;
- }
}
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java?rev=1605248&r1=1605247&r2=1605248&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java Wed Jun 25 04:05:50 2014
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
-import java.net.ServerSocket;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -97,7 +96,7 @@ public class FlumePersistentAppenderTest
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = findFreePorts(2);
+ final int[] ports = FreePortFinder.findFreePorts(2);
System.setProperty("primaryPort", Integer.toString(ports[0]));
System.setProperty("alternatePort", Integer.toString(ports[1]));
primary = new EventCollector(ports[0]);
@@ -443,26 +442,4 @@ public class FlumePersistentAppenderTest
}
return stringMap;
}
-
- private static int[] findFreePorts(final int count) throws IOException {
- final int[] ports = new int[count];
- final ServerSocket[] sockets = new ServerSocket[count];
- try {
- for (int i = 0; i < count; ++i) {
- sockets[i] = new ServerSocket(0);
- ports[i] = sockets[i].getLocalPort();
- }
- } finally {
- for (int i = 0; i < count; ++i) {
- if (sockets[i] != null) {
- try {
- sockets[i].close();
- } catch (final Exception ex) {
- // Ignore the error.
- }
- }
- }
- }
- return ports;
- }
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java?rev=1605248&r1=1605247&r2=1605248&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java Wed Jun 25 04:05:50 2014
@@ -93,7 +93,7 @@ public class FlumePersistentPerf {
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = findFreePorts(2);
+ final int[] ports = FreePortFinder.findFreePorts(2);
System.setProperty("primaryPort", Integer.toString(ports[0]));
System.setProperty("alternatePort", Integer.toString(ports[1]));
primary = new EventCollector(ports[0]);
@@ -217,26 +217,4 @@ public class FlumePersistentPerf {
}
return stringMap;
}
-
- private static int[] findFreePorts(final int count) throws IOException {
- final int[] ports = new int[count];
- final ServerSocket[] sockets = new ServerSocket[count];
- try {
- for (int i = 0; i < count; ++i) {
- sockets[i] = new ServerSocket(0);
- ports[i] = sockets[i].getLocalPort();
- }
- } finally {
- for (int i = 0; i < count; ++i) {
- if (sockets[i] != null) {
- try {
- sockets[i].close();
- } catch (final Exception ex) {
- // Ignore the error.
- }
- }
- }
- }
- return ports;
- }
}
\ No newline at end of file
Added: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java?rev=1605248&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java (added)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java Wed Jun 25 04:05:50 2014
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.flume.appender;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+public class FreePortFinder {
+
+ public static int[] findFreePorts(final int count) throws IOException {
+ final int[] ports = new int[count];
+ final ServerSocket[] sockets = new ServerSocket[count];
+ try {
+ for (int i = 0; i < count; ++i) {
+ sockets[i] = new ServerSocket(0);
+ ports[i] = sockets[i].getLocalPort();
+ }
+ } finally {
+ for (int i = 0; i < count; ++i) {
+ if (sockets[i] != null) {
+ try {
+ sockets[i].close();
+ } catch (final Exception e) {
+ // Ignore the error.
+ }
+ }
+ }
+ }
+ return ports;
+ }
+
+}
Propchange: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FreePortFinder.java
------------------------------------------------------------------------------
svn:keywords = Id