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 2016/09/14 15:14:37 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1582 When initializing on
platforms where JMX is not available,
Interpolator component should not print stack trace for warning messages.
Repository: logging-log4j2
Updated Branches:
refs/heads/master f6040c721 -> 8a149a106
LOG4J2-1582 When initializing on platforms where JMX is not available, Interpolator component should not print stack trace for warning messages.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f95c90ba
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f95c90ba
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f95c90ba
Branch: refs/heads/master
Commit: f95c90ba6880aef1630aca826771095ad5ee08d8
Parents: 01cc155
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 15 00:14:24 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 15 00:14:24 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/lookup/Interpolator.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f95c90ba/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
index 02a0fc6..18280e7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
@@ -98,18 +98,19 @@ public class Interpolator extends AbstractConfigurationAwareLookup {
// java.lang.VerifyError: org/apache/logging/log4j/core/lookup/JndiLookup
LOGGER.warn( // LOG4J2-1582 don't print the whole stack trace (it is just a warning...)
"JNDI lookup class is not available because this JRE does not support JNDI." +
- " JNDI string lookups will not be available, continuing configuration. Ignoring: " + e);
+ " JNDI string lookups will not be available, continuing configuration. Ignoring " + e);
}
// JMX input args
try {
// We might be on Android
lookups.put("jvmrunargs",
- Loader.newCheckedInstanceOf("org.apache.logging.log4j.core.lookup.JmxRuntimeInputArgumentsLookup", StrLookup.class));
+ Loader.newCheckedInstanceOf("org.apache.logging.log4j.core.lookup.JmxRuntimeInputArgumentsLookup",
+ StrLookup.class));
} catch (final Throwable e) {
// java.lang.VerifyError: org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup
LOGGER.warn(
- "JMX runtime input lookup class is not available because this JRE does not support JMX. JMX lookups will not be available, continuing configuration.",
- e);
+ "JMX runtime input lookup class is not available because this JRE does not support JMX. " +
+ "JMX lookups will not be available, continuing configuration. Ignoring " + e);
}
lookups.put("date", new DateLookup());
lookups.put("ctx", new ContextMapLookup());
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8a149a10
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8a149a10
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8a149a10
Branch: refs/heads/master
Commit: 8a149a1060b4010359aff94bf2eb601bac8fad7f
Parents: f95c90b f6040c7
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 15 00:14:44 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 15 00:14:44 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/routing/Routes.java | 148 +++++++++--
.../core/appender/routing/RoutingAppender.java | 19 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 265 ++++++++++---------
.../routing/DefaultRouteScriptAppenderTest.java | 13 +-
.../routing/RoutesScriptAppenderTest.java | 130 +++++++++
.../routing/RoutingAppenderWithPurgingTest.java | 1 -
...og4j-routing-default-route-script-groovy.xml | 8 +-
...-routing-default-route-script-javascript.xml | 2 +-
.../log4j-routing-routes-script-groovy.xml | 43 +++
.../log4j-routing-routes-script-javascript.xml | 40 +++
src/site/xdoc/manual/appenders.xml | 103 ++++++-
11 files changed, 597 insertions(+), 175 deletions(-)
----------------------------------------------------------------------