You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/09/10 18:10:18 UTC
logging-log4j2 git commit: Checkstyle fixes
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0c9f056bc -> 5ea3fc97f
Checkstyle fixes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5ea3fc97
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5ea3fc97
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5ea3fc97
Branch: refs/heads/master
Commit: 5ea3fc97f149f13fc826ea535157e32f0a488a07
Parents: 0c9f056
Author: rpopma <rp...@apache.org>
Authored: Fri Sep 11 01:10:14 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Sep 11 01:10:14 2015 +0900
----------------------------------------------------------------------
.../log4j/core/appender/FailoverAppender.java | 2 +-
.../log4j/core/appender/FileAppender.java | 7 +++---
.../core/appender/MemoryMappedFileManager.java | 24 +++++++++++++-------
.../core/appender/RandomAccessFileAppender.java | 7 +++---
.../db/jpa/AbstractLogEventWrapperEntity.java | 14 ++++++------
5 files changed, 32 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ea3fc97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
index 32f051b..1011e29 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
@@ -130,7 +130,7 @@ public final class FailoverAppender extends AbstractAppender {
private void failover(final LogEvent event, final Exception ex) {
final RuntimeException re = ex != null ?
- (ex instanceof LoggingException ? (LoggingException)ex : new LoggingException(ex)) : null;
+ (ex instanceof LoggingException ? (LoggingException) ex : new LoggingException(ex)) : null;
boolean written = false;
Exception failoverException = null;
for (final AppenderControl control : failoverAppenders) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ea3fc97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 9c4517f..d415ce2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -45,9 +45,10 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
private final Advertiser advertiser;
private Object advertisement;
- private FileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter, final FileManager manager,
- final String filename, final boolean ignoreExceptions, final boolean immediateFlush,
- final Advertiser advertiser) {
+ private FileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
+ final FileManager manager, final String filename, final boolean ignoreExceptions,
+ final boolean immediateFlush, final Advertiser advertiser) {
+
super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
if (advertiser != null) {
final Map<String, String> configuration = new HashMap<>(layout.getContentFormat());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ea3fc97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
index c9eeb60..4998b7b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
@@ -42,17 +42,24 @@ import org.apache.logging.log4j.core.util.NullOutputStream;
* <p>
*
* @see <a
- * href="http://www.codeproject.com/Tips/683614/Things-to-Know-about-Memory-Mapped-File-in-Java">http://www.codeproject.com/Tips/683614/Things-to-Know-about-Memory-Mapped-File-in-Java</a>
+ * href="http://www.codeproject.com/Tips/683614/Things-to-Know-about-Memory-Mapped-File-in-Java">
+ * http://www.codeproject.com/Tips/683614/Things-to-Know-about-Memory-Mapped-File-in-Java</a>
* @see <a href="http://bugs.java.com/view_bug.do?bug_id=6893654">http://bugs.java.com/view_bug.do?bug_id=6893654</a>
* @see <a href="http://bugs.java.com/view_bug.do?bug_id=4724038">http://bugs.java.com/view_bug.do?bug_id=4724038</a>
* @see <a
- * href="http://stackoverflow.com/questions/9261316/memory-mapped-mappedbytebuffer-or-direct-bytebuffer-for-db-implementation">http://stackoverflow.com/questions/9261316/memory-mapped-mappedbytebuffer-or-direct-bytebuffer-for-db-implementation</a>
+ * href="http://stackoverflow.com/questions/9261316/memory-mapped-mappedbytebuffer-or-direct-bytebuffer-for-db-implementation">
+ * http://stackoverflow.com/questions/9261316/memory-mapped-mappedbytebuffer-or-direct-bytebuffer-for-db-implementation</a>
*
* @since 2.1
*/
public class MemoryMappedFileManager extends OutputStreamManager {
+ /**
+ *
+ */
+ private static final int MAX_REMAP_COUNT = 10;
static final int DEFAULT_REGION_LENGTH = 32 * 1024 * 1024;
private static final MemoryMappedFileManagerFactory FACTORY = new MemoryMappedFileManagerFactory();
+ private static final double NANOS_PER_MILLISEC = 1000.0 * 1000.0;
private final boolean isForce;
private final int regionLength;
@@ -128,7 +135,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
final long startNanos = System.nanoTime();
randomAccessFile.setLength(fileLength);
- final float millis = (float) ((System.nanoTime() - startNanos) / (1000.0 * 1000.0));
+ final float millis = (float) ((System.nanoTime() - startNanos) / NANOS_PER_MILLISEC);
LOGGER.debug("MMapAppender extended {} OK in {} millis", getFileName(), millis);
mappedBuffer = mmap(randomAccessFile.getChannel(), getFileName(), offset, length);
@@ -172,7 +179,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
final MappedByteBuffer map = fileChannel.map(FileChannel.MapMode.READ_WRITE, start, size);
map.order(ByteOrder.nativeOrder());
- final float millis = (float) ((System.nanoTime() - startNanos) / (1000.0 * 1000.0));
+ final float millis = (float) ((System.nanoTime() - startNanos) / NANOS_PER_MILLISEC);
LOGGER.debug("MMapAppender remapped {} OK in {} millis", fileName, millis);
return map;
@@ -180,8 +187,8 @@ public class MemoryMappedFileManager extends OutputStreamManager {
if (e.getMessage() == null || !e.getMessage().endsWith("user-mapped section open")) {
throw e;
}
- LOGGER.debug("Remap attempt {}/10 failed. Retrying...", i, e);
- if (i < 10) {
+ LOGGER.debug("Remap attempt {}/{} failed. Retrying...", i, MAX_REMAP_COUNT, e);
+ if (i < MAX_REMAP_COUNT) {
Thread.yield();
} else {
try {
@@ -209,7 +216,7 @@ public class MemoryMappedFileManager extends OutputStreamManager {
return null;
}
});
- final float millis = (float) ((System.nanoTime() - startNanos) / (1000.0 * 1000.0));
+ final float millis = (float) ((System.nanoTime() - startNanos) / NANOS_PER_MILLISEC);
LOGGER.debug("MMapAppender unmapped buffer OK in {} millis", millis);
}
@@ -286,7 +293,8 @@ public class MemoryMappedFileManager extends OutputStreamManager {
/**
* Factory to create a MemoryMappedFileManager.
*/
- private static class MemoryMappedFileManagerFactory implements ManagerFactory<MemoryMappedFileManager, FactoryData> {
+ private static class MemoryMappedFileManagerFactory
+ implements ManagerFactory<MemoryMappedFileManager, FactoryData> {
/**
* Create a MemoryMappedFileManager.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ea3fc97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
index 7b39175..006ec0a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
@@ -46,9 +46,10 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
private Object advertisement;
private final Advertiser advertiser;
- private RandomAccessFileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
- final RandomAccessFileManager manager, final String filename, final boolean ignoreExceptions,
- final boolean immediateFlush, final Advertiser advertiser) {
+ private RandomAccessFileAppender(final String name, final Layout<? extends Serializable> layout,
+ final Filter filter, final RandomAccessFileManager manager, final String filename,
+ final boolean ignoreExceptions, final boolean immediateFlush, final Advertiser advertiser) {
+
super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
if (advertiser != null) {
final Map<String, String> configuration = new HashMap<>(
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ea3fc97/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
index 07dec4e..ae256ef 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
@@ -49,12 +49,12 @@ import org.apache.logging.log4j.message.Message;
* </p>
* <p>
* Many of the return types of {@link LogEvent} methods (e.g., {@link StackTraceElement}, {@link Message},
- * {@link Marker}, {@link Throwable},
- * {@link org.apache.logging.log4j.ThreadContext.ContextStack ThreadContext.ContextStack}, and
- * {@link Map Map<String, String>}) will not be recognized by the JPA provider. In conjunction with
- * {@link javax.persistence.Convert @Convert}, you can use the converters in the
+ * {@link Marker}, {@link Throwable},
+ * {@link org.apache.logging.log4j.ThreadContext.ContextStack ThreadContext.ContextStack}, and
+ * {@link Map Map<String, String>}) will not be recognized by the JPA provider. In conjunction with
+ * {@link javax.persistence.Convert @Convert}, you can use the converters in the
* {@link org.apache.logging.log4j.core.appender.db.jpa.converter} package to convert these types to database columns.
- * If you want to retrieve log events from the database, you can create a true POJO entity and also use these
+ * If you want to retrieve log events from the database, you can create a true POJO entity and also use these
* converters for extracting persisted values.<br>
* </p>
* <p>
@@ -169,7 +169,7 @@ public abstract class AbstractLogEventWrapperEntity implements LogEvent {
/**
* A no-op mutator to satisfy JPA requirements, as this entity is write-only.
*
- * @param millis Ignored.
+ * @param nanoTime Ignored.
*/
@SuppressWarnings("unused")
public void setNanoTime(final long nanoTime) {
@@ -267,6 +267,6 @@ public abstract class AbstractLogEventWrapperEntity implements LogEvent {
private static class NullLogEvent extends AbstractLogEvent {
private static final long serialVersionUID = 1L;
- // Inherits everything
+ // Inherits everything
}
}