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:26:59 UTC
svn commit: r1605258 - in /logging/log4j/log4j2/trunk/log4j-flume-ng/src:
main/java/org/apache/logging/log4j/flume/appender/
test/java/org/apache/logging/log4j/flume/appender/
Author: ggregory
Date: Wed Jun 25 04:26:59 2014
New Revision: 1605258
URL: http://svn.apache.org/r1605258
Log:
Use final.
Modified:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1605258&r1=1605257&r2=1605258&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java Wed Jun 25 04:26:59 2014
@@ -113,7 +113,7 @@ public class FlumeEmbeddedManager extend
public void send(final Event event) {
try {
agent.put(event);
- } catch (EventDeliveryException ex) {
+ } catch (final EventDeliveryException ex) {
throw new LoggingException("Unable to deliver event to Flume Appender " + shortName, ex);
}
}
@@ -167,7 +167,7 @@ public class FlumeEmbeddedManager extend
try {
final Map<String, String> props = createProperties(data.name, data.agents, data.properties,
data.batchSize, data.dataDir);
- EmbeddedAgent agent = new EmbeddedAgent(name);
+ final EmbeddedAgent agent = new EmbeddedAgent(name);
agent.configure(props);
agent.start();
LOGGER.debug("Created Agent " + name);
@@ -214,7 +214,7 @@ public class FlumeEmbeddedManager extend
final StringBuilder sb = new StringBuilder();
String leading = Strings.EMPTY;
- int priority = agents.length;
+ final int priority = agents.length;
for (int i = 0; i < priority; ++i) {
sb.append(leading).append("agent").append(i);
leading = " ";
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1605258&r1=1605257&r2=1605258&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java Wed Jun 25 04:26:59 2014
@@ -159,7 +159,7 @@ public class FlumeEvent extends SimpleEv
protected void addContextData(final String prefix, final Map<String, String> fields,
final Map<String, String> context) {
- Map<String, String> map = new HashMap<String, String>();
+ final Map<String, String> map = new HashMap<String, String>();
for (final Map.Entry<String, String> entry : context.entrySet()) {
if (entry.getKey() != null && entry.getValue() != null) {
fields.put(prefix + entry.getKey(), entry.getValue());
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java?rev=1605258&r1=1605257&r2=1605258&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Wed Jun 25 04:26:59 2014
@@ -223,7 +223,7 @@ public class FlumePersistentManager exte
worker.shutdown();
try {
worker.join(SHUTDOWN_WAIT * MILLIS_PER_SECOND);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
// Ignore the exception and shutdown.
}
threadPool.shutdown();
@@ -315,13 +315,13 @@ public class FlumePersistentManager exte
txn = null;
}
}
- } catch (LockConflictException lce) {
+ } catch (final LockConflictException lce) {
exception = lce;
if (txn != null) {
try {
txn.abort();
txn = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignoring exception while aborting transaction during lock conflict.");
}
}
@@ -329,7 +329,7 @@ public class FlumePersistentManager exte
}
try {
Thread.sleep(LOCK_TIMEOUT_SLEEP_MILLIS);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
// Ignore the error
}
}
@@ -518,14 +518,14 @@ public class FlumePersistentManager exte
LOGGER.trace("WriterThread started - batch size = " + batchSize + ", delay = " + manager.delay);
long nextBatch = System.currentTimeMillis() + manager.delay;
while (!shutdown) {
- long now = System.currentTimeMillis();
- long dbCount = database.count();
+ final long now = System.currentTimeMillis();
+ final long dbCount = database.count();
dbCounter.set(dbCount);
if (dbCount >= batchSize || dbCount > 0 && nextBatch <= now) {
nextBatch = now + manager.delay;
try {
boolean errors = false;
- DatabaseEntry key = new DatabaseEntry();
+ final DatabaseEntry key = new DatabaseEntry();
final DatabaseEntry data = new DatabaseEntry();
gate.close();
@@ -591,13 +591,13 @@ public class FlumePersistentManager exte
txn = null;
}
}
- } catch (LockConflictException lce) {
+ } catch (final LockConflictException lce) {
exception = lce;
if (cursor != null) {
try {
cursor.close();
cursor = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignored exception closing cursor during lock conflict.");
}
}
@@ -605,14 +605,14 @@ public class FlumePersistentManager exte
try {
txn.abort();
txn = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignored exception aborting tx during lock conflict.");
}
}
}
try {
Thread.sleep(LOCK_TIMEOUT_SLEEP_MILLIS);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
// Ignore the error
}
}
@@ -644,7 +644,7 @@ public class FlumePersistentManager exte
}
if (batchSize > 1 && database.count() > 0) {
- DatabaseEntry key = new DatabaseEntry();
+ final DatabaseEntry key = new DatabaseEntry();
final DatabaseEntry data = new DatabaseEntry();
try {
sendBatch(key, data);
@@ -655,7 +655,7 @@ public class FlumePersistentManager exte
LOGGER.trace("WriterThread exiting");
}
- private boolean sendBatch(DatabaseEntry key, DatabaseEntry data) throws Exception {
+ private boolean sendBatch(DatabaseEntry key, final DatabaseEntry data) throws Exception {
boolean errors = false;
OperationStatus status;
Cursor cursor = database.openCursor(null, CursorConfig.DEFAULT);
@@ -707,7 +707,7 @@ public class FlumePersistentManager exte
try {
cursor.close();
cursor = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignored exception closing cursor during lock conflict.");
}
}
@@ -715,7 +715,7 @@ public class FlumePersistentManager exte
try {
txn.abort();
txn = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignored exception aborting transaction during lock conflict.");
}
}
@@ -725,13 +725,13 @@ public class FlumePersistentManager exte
txn.abort();
}
}
- } catch (LockConflictException lce) {
+ } catch (final LockConflictException lce) {
exception = lce;
if (cursor != null) {
try {
cursor.close();
cursor = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignored exception closing cursor during lock conflict.");
}
}
@@ -739,7 +739,7 @@ public class FlumePersistentManager exte
try {
txn.abort();
txn = null;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
LOGGER.trace("Ignored exception aborting transaction during lock conflict.");
}
}
@@ -755,7 +755,7 @@ public class FlumePersistentManager exte
}
try {
Thread.sleep(LOCK_TIMEOUT_SLEEP_MILLIS);
- } catch (InterruptedException ie) {
+ } catch (final InterruptedException ie) {
// Ignore the error
}
}
@@ -855,7 +855,7 @@ public class FlumePersistentManager exte
isOpen = false;
}
- public synchronized void waitForOpen(long timeout) throws InterruptedException {
+ public synchronized void waitForOpen(final long timeout) throws InterruptedException {
wait(timeout);
}
}
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=1605258&r1=1605257&r2=1605258&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:26:59 2014
@@ -239,10 +239,10 @@ public class FlumePersistentAppenderTest
final int eventsCount = 10000;
- Thread writer1 = new WriterThread(0, eventsCount / 4);
- Thread writer2 = new WriterThread(eventsCount / 4, eventsCount / 2);
- Thread writer3 = new WriterThread(eventsCount / 2, (3 * eventsCount) / 4);
- Thread writer4 = new WriterThread((3 * eventsCount) / 4, eventsCount);
+ final Thread writer1 = new WriterThread(0, eventsCount / 4);
+ final Thread writer2 = new WriterThread(eventsCount / 4, eventsCount / 2);
+ final Thread writer3 = new WriterThread(eventsCount / 2, (3 * eventsCount) / 4);
+ final Thread writer4 = new WriterThread((3 * eventsCount) / 4, eventsCount);
writer1.start();
writer2.start();
writer3.start();
@@ -250,10 +250,10 @@ public class FlumePersistentAppenderTest
final boolean[] fields = new boolean[eventsCount];
- Thread reader1 = new ReaderThread(0, eventsCount / 4, fields);
- Thread reader2 = new ReaderThread(eventsCount / 4, eventsCount / 2, fields);
- Thread reader3 = new ReaderThread(eventsCount / 2, (eventsCount * 3) / 4, fields);
- Thread reader4 = new ReaderThread((eventsCount * 3) / 4, eventsCount, fields);
+ final Thread reader1 = new ReaderThread(0, eventsCount / 4, fields);
+ final Thread reader2 = new ReaderThread(eventsCount / 4, eventsCount / 2, fields);
+ final Thread reader3 = new ReaderThread(eventsCount / 2, (eventsCount * 3) / 4, fields);
+ final Thread reader4 = new ReaderThread((eventsCount * 3) / 4, eventsCount, fields);
reader1.start();
reader2.start();
@@ -294,7 +294,7 @@ public class FlumePersistentAppenderTest
private final int start;
private final int stop;
- public WriterThread(int start, int stop) {
+ public WriterThread(final int start, final int stop) {
this.start = start;
this.stop = stop;
}
@@ -315,7 +315,7 @@ public class FlumePersistentAppenderTest
private final int stop;
private final boolean[] fields;
- private ReaderThread(int start, int stop, boolean[] fields) {
+ private ReaderThread(final int start, final int stop, final boolean[] fields) {
this.start = start;
this.stop = stop;
this.fields = fields;