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 2017/11/11 22:29:33 UTC
[1/3] logging-log4j2 git commit: No need to nest else.
Repository: logging-log4j2
Updated Branches:
refs/heads/master a23a48590 -> b49b9e8de
No need to nest else.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7d82156a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7d82156a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7d82156a
Branch: refs/heads/master
Commit: 7d82156a27faf673002c210577803828e0375847
Parents: a23a485
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Nov 11 15:28:36 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Nov 11 15:28:36 2017 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7d82156a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
----------------------------------------------------------------------
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
index 5069dd3..b084464 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
@@ -178,9 +178,8 @@ public class TomcatLogger implements Log {
}
if (uri == null) {
return getContext(FQCN, cl, false);
- } else {
- return getContext(FQCN, cl, false, uri, "Tomcat");
}
+ return getContext(FQCN, cl, false, uri, "Tomcat");
}
public static ExtendedLogger getLogger(final String name) {
[2/3] logging-log4j2 git commit: Remove trailing white spaces.
Posted by gg...@apache.org.
Remove trailing white spaces.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/412b81cb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/412b81cb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/412b81cb
Branch: refs/heads/master
Commit: 412b81cbc0e10ec8ee0ebbb53e555bb02d498a7e
Parents: 7d82156
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Nov 11 15:29:08 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Nov 11 15:29:08 2017 -0700
----------------------------------------------------------------------
.../log4j/appserver/jetty/Log4j2Logger.java | 30 ++++++++++----------
.../log4j/appserver/tomcat/TomcatLogger.java | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/412b81cb/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
----------------------------------------------------------------------
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
index 4c858de..02069b8 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
@@ -23,7 +23,7 @@ import org.eclipse.jetty.util.log.Logger;
/**
* Provides a native Apache Log4j 2 for Jetty logging.
- *
+ *
* @since 2.10.0
*/
public class Log4j2Logger extends AbstractLogger {
@@ -44,7 +44,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#debug(java.lang.String, java.lang.Object[])
*/
@Override
@@ -54,7 +54,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#debug(java.lang.String, java.lang.Throwable)
*/
@Override
@@ -64,7 +64,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#debug(java.lang.Throwable)
*/
@Override
@@ -74,7 +74,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#getName()
*/
@Override
@@ -84,7 +84,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#ignore(java.lang.Throwable)
*/
@Override
@@ -95,7 +95,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#info(java.lang.String, java.lang.Object[])
*/
@Override
@@ -105,7 +105,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#info(java.lang.String, java.lang.Throwable)
*/
@Override
@@ -115,7 +115,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#info(java.lang.Throwable)
*/
@Override
@@ -125,7 +125,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#isDebugEnabled()
*/
@Override
@@ -135,7 +135,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.AbstractLogger#newLogger(java.lang.String)
*/
@Override
@@ -145,7 +145,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#setDebugEnabled(boolean)
*/
@Override
@@ -155,7 +155,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#warn(java.lang.String, java.lang.Object[])
*/
@Override
@@ -165,7 +165,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#warn(java.lang.String, java.lang.Throwable)
*/
@Override
@@ -175,7 +175,7 @@ public class Log4j2Logger extends AbstractLogger {
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.jetty.util.log.Logger#warn(java.lang.Throwable)
*/
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/412b81cb/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
----------------------------------------------------------------------
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
index b084464..311811b 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.spi.LoggerContext;
* first file it finds with one of the following file names: log4j2-tomcat.xml, log4j2-tomcat.json,
* log4j2-tomcat.yaml, log4j2-tomcat.yml, log4j2-tomcat.properties. Again, this can be accomplished by adding
* this file to a directory and then adding that directory to the CLASSPATH environment variable in setenv.sh.
- *
+ *
* @since 2.10.0
*/
public class TomcatLogger implements Log {
[3/3] logging-log4j2 git commit: Use final.
Posted by gg...@apache.org.
Use final.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b49b9e8d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b49b9e8d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b49b9e8d
Branch: refs/heads/master
Commit: b49b9e8de0f2fd109415962ebcc877fd9b1c46b9
Parents: 412b81c
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Nov 11 15:29:30 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Nov 11 15:29:30 2017 -0700
----------------------------------------------------------------------
.../log4j/appserver/tomcat/TomcatLogger.java | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b49b9e8d/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
----------------------------------------------------------------------
diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
index 311811b..0ad14ca 100644
--- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
+++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java
@@ -63,7 +63,7 @@ public class TomcatLogger implements Log {
* This constructor is used by LogFactory to create a new Logger.
* @param name The name of the Logger.
*/
- public TomcatLogger(String name) {
+ public TomcatLogger(final String name) {
this.logger = PrivateManager.getLogger(name);
}
@@ -98,62 +98,62 @@ public class TomcatLogger implements Log {
}
@Override
- public void trace(Object o) {
+ public void trace(final Object o) {
logger.logIfEnabled(FQCN, Level.TRACE, null, o, null);
}
@Override
- public void trace(Object o, Throwable throwable) {
+ public void trace(final Object o, final Throwable throwable) {
logger.logIfEnabled(FQCN, Level.TRACE, null, o, throwable);
}
@Override
- public void debug(Object o) {
+ public void debug(final Object o) {
logger.logIfEnabled(FQCN, Level.DEBUG, null, o, null);
}
@Override
- public void debug(Object o, Throwable throwable) {
+ public void debug(final Object o, final Throwable throwable) {
logger.logIfEnabled(FQCN, Level.DEBUG, null, o, throwable);
}
@Override
- public void info(Object o) {
+ public void info(final Object o) {
logger.logIfEnabled(FQCN, Level.INFO, null, o, null);
}
@Override
- public void info(Object o, Throwable throwable) {
+ public void info(final Object o, final Throwable throwable) {
logger.logIfEnabled(FQCN, Level.INFO, null, o, throwable);
}
@Override
- public void warn(Object o) {
+ public void warn(final Object o) {
logger.logIfEnabled(FQCN, Level.WARN, null, o, null);
}
@Override
- public void warn(Object o, Throwable throwable) {
+ public void warn(final Object o, final Throwable throwable) {
logger.logIfEnabled(FQCN, Level.WARN, null, o, throwable);
}
@Override
- public void error(Object o) {
+ public void error(final Object o) {
logger.logIfEnabled(FQCN, Level.ERROR, null, o, null);
}
@Override
- public void error(Object o, Throwable throwable) {
+ public void error(final Object o, final Throwable throwable) {
logger.logIfEnabled(FQCN, Level.ERROR, null, o, throwable);
}
@Override
- public void fatal(Object o) {
+ public void fatal(final Object o) {
logger.logIfEnabled(FQCN, Level.FATAL, null, o, null);
}
@Override
- public void fatal(Object o, Throwable throwable) {
+ public void fatal(final Object o, final Throwable throwable) {
logger.logIfEnabled(FQCN, Level.FATAL, null, o, throwable);
}
@@ -163,16 +163,16 @@ public class TomcatLogger implements Log {
private static class PrivateManager extends LogManager {
public static LoggerContext getContext() {
- ClassLoader cl = TomcatLogger.class.getClassLoader();
+ final ClassLoader cl = TomcatLogger.class.getClassLoader();
URI uri = null;
- for (String fileName : FILE_NAMES) {
+ for (final String fileName : FILE_NAMES) {
try {
- URL url = cl.getResource(fileName);
+ final URL url = cl.getResource(fileName);
if (url != null) {
uri = url.toURI();
break;
}
- } catch (URISyntaxException ex) {
+ } catch (final URISyntaxException ex) {
// Ignore the exception.
}
}
@@ -183,7 +183,7 @@ public class TomcatLogger implements Log {
}
public static ExtendedLogger getLogger(final String name) {
- LoggerContext context = getContext();
+ final LoggerContext context = getContext();
return context.getLogger(name);
}
}