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/24 10:51:07 UTC
[14/35] logging-log4j2 git commit: Checkstyle: 'level' hides field,
FileTabCharacter, LineLength, trailing space. IDE autoformatted.
Checkstyle: 'level' hides field, FileTabCharacter, LineLength, trailing
space. 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/20e5e9c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/20e5e9c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/20e5e9c5
Branch: refs/heads/master
Commit: 20e5e9c529ac332e8496833d57b71ff42f67c61f
Parents: 111ea36
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 24 09:13:40 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 24 09:13:40 2015 +0200
----------------------------------------------------------------------
.../apache/logging/log4j/simple/SimpleLogger.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/20e5e9c5/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
index 12699ce..b633ef9 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
/**
- * This is the default logger that is used when no suitable logging implementation is available.
+ * This is the default logger that is used when no suitable logging implementation is available.
*/
public class SimpleLogger extends AbstractLogger {
@@ -40,7 +40,7 @@ public class SimpleLogger extends AbstractLogger {
private static final char SPACE = ' ';
- /**
+ /**
* Used to format times.
* <p>
* Note that DateFormat is not Thread-safe.
@@ -58,11 +58,10 @@ public class SimpleLogger extends AbstractLogger {
private final String logName;
-
public SimpleLogger(final String name, final Level defaultLevel, final boolean showLogName,
- final boolean showShortLogName, final boolean showDateTime, final boolean showContextMap,
- final String dateTimeFormat, final MessageFactory messageFactory, final PropertiesUtil props,
- final PrintStream stream) {
+ final boolean showShortLogName, final boolean showDateTime, final boolean showContextMap,
+ final String dateTimeFormat, final MessageFactory messageFactory, final PropertiesUtil props,
+ final PrintStream stream) {
super(name, messageFactory);
final String lvl = props.getStringProperty(SimpleLoggerContext.SYSTEM_PREFIX + name + ".level");
this.level = Level.toLevel(lvl, defaultLevel);
@@ -76,7 +75,7 @@ public class SimpleLogger extends AbstractLogger {
} else if (showLogName) {
this.logName = name;
} else {
- this.logName = null;
+ this.logName = null;
}
this.showDateTime = showDateTime;
this.showContextMap = showContextMap;
@@ -123,7 +122,7 @@ public class SimpleLogger extends AbstractLogger {
}
@Override
- public void logMessage(final String fqcn, final Level level, final Marker marker, final Message msg,
+ public void logMessage(final String fqcn, final Level mgsLevel, final Marker marker, final Message msg,
final Throwable throwable) {
final StringBuilder sb = new StringBuilder();
// Append date-time if so configured
@@ -137,7 +136,7 @@ public class SimpleLogger extends AbstractLogger {
sb.append(SPACE);
}
- sb.append(level.toString());
+ sb.append(mgsLevel.toString());
sb.append(SPACE);
if (Strings.isNotEmpty(logName)) {
sb.append(logName);