You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/09/27 20:40:56 UTC
[04/50] [abbrv] logging-log4j2 git commit: Checkstyle:
DeclarationOrder, Empty catch block, LineLength (IDE autoformatted)
Checkstyle: DeclarationOrder, Empty catch block, LineLength (IDE
autoformatted)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a7a93da9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a7a93da9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a7a93da9
Branch: refs/heads/LOG4J2-1136
Commit: a7a93da92c4b55782b21d09919d8c4ed84d6085d
Parents: b5d9f4b
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 24 09:32:19 2015 +0200
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Sep 27 10:47:28 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/status/StatusLogger.java | 41 +++++++++++++-------
1 file changed, 26 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a7a93da9/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
index cd96569..fb015f1 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
@@ -42,14 +42,14 @@ import org.apache.logging.log4j.util.Strings;
*/
public final class StatusLogger extends AbstractLogger {
- private static final long serialVersionUID = 2L;
-
/**
- * System property that can be configured with the number of entries in the queue. Once the limit
- * is reached older entries will be removed as new entries are added.
+ * System property that can be configured with the number of entries in the queue. Once the limit is reached older
+ * entries will be removed as new entries are added.
*/
public static final String MAX_STATUS_ENTRIES = "log4j2.status.entries";
+ private static final long serialVersionUID = 2L;
+
private static final String NOT_AVAIL = "?";
private static final PropertiesUtil PROPS = new PropertiesUtil("log4j2.StatusLogger.properties");
@@ -63,25 +63,28 @@ public final class StatusLogger extends AbstractLogger {
private final SimpleLogger logger;
private final Collection<StatusListener> listeners = new CopyOnWriteArrayList<>();
-
- @SuppressWarnings("NonSerializableFieldInSerializableClass") // ReentrantReadWriteLock is Serializable
+
+ @SuppressWarnings("NonSerializableFieldInSerializableClass")
+ // ReentrantReadWriteLock is Serializable
private final ReadWriteLock listenersLock = new ReentrantReadWriteLock();
private final Queue<StatusData> messages = new BoundedQueue<>(MAX_ENTRIES);
-
- @SuppressWarnings("NonSerializableFieldInSerializableClass") // ReentrantLock is Serializable
+
+ @SuppressWarnings("NonSerializableFieldInSerializableClass")
+ // ReentrantLock is Serializable
private final Lock msgLock = new ReentrantLock();
private int listenersLevel;
private StatusLogger() {
- this.logger = new SimpleLogger("StatusLogger", Level.ERROR, false, true, false, false, Strings.EMPTY, null, PROPS,
- System.err);
+ this.logger = new SimpleLogger("StatusLogger", Level.ERROR, false, true, false, false, Strings.EMPTY, null,
+ PROPS, System.err);
this.listenersLevel = Level.toLevel(DEFAULT_STATUS_LEVEL, Level.WARN).intLevel();
}
/**
* Retrieve the StatusLogger.
+ *
* @return The StatusLogger.
*/
public static StatusLogger getLogger() {
@@ -94,6 +97,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Registers a new listener.
+ *
* @param listener The StatusListener to register.
*/
public void registerListener(final StatusListener listener) {
@@ -111,6 +115,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Removes a StatusListener.
+ *
* @param listener The StatusListener to remove.
*/
public void removeListener(final StatusListener listener) {
@@ -133,6 +138,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Returns a thread safe Iterable for the StatusListener.
+ *
* @return An Iterable for the list of StatusListeners.
*/
public Iterable<StatusListener> getListeners() {
@@ -160,11 +166,13 @@ public final class StatusLogger extends AbstractLogger {
try {
resource.close();
} catch (final IOException ignored) {
+ // ignored
}
}
/**
* Returns a List of all events as StatusData objects.
+ *
* @return The list of StatusData objects.
*/
public List<StatusData> getStatusData() {
@@ -195,14 +203,16 @@ public final class StatusLogger extends AbstractLogger {
/**
* Adds an event.
+ *
* @param marker The Marker
- * @param fqcn The fully qualified class name of the <b>caller</b>
- * @param level The logging level
- * @param msg The message associated with the event.
- * @param t A Throwable or null.
+ * @param fqcn The fully qualified class name of the <b>caller</b>
+ * @param level The logging level
+ * @param msg The message associated with the event.
+ * @param t A Throwable or null.
*/
@Override
- public void logMessage(final String fqcn, final Level level, final Marker marker, final Message msg, final Throwable t) {
+ public void logMessage(final String fqcn, final Level level, final Marker marker, final Message msg,
+ final Throwable t) {
StackTraceElement element = null;
if (fqcn != null) {
element = getStackTraceElement(fqcn, Thread.currentThread().getStackTrace());
@@ -279,6 +289,7 @@ public final class StatusLogger extends AbstractLogger {
/**
* Queues for status events.
+ *
* @param <E> Object type to be stored in the queue.
*/
private class BoundedQueue<E> extends ConcurrentLinkedQueue<E> {