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 2018/10/30 01:08:19 UTC
logging-log4j2 git commit: [LOG4J2-2493] Remove deprecated code. Fix
scripts.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 770312cb3 -> 3c558e03e
[LOG4J2-2493] Remove deprecated code. Fix scripts.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3c558e03
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3c558e03
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3c558e03
Branch: refs/heads/master
Commit: 3c558e03e9d3854535f5a2c13e16cb2ad20c6cad
Parents: 770312c
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Oct 29 19:08:15 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Oct 29 19:08:15 2018 -0600
----------------------------------------------------------------------
.../src/test/resources/log4j-script-filters.xml | 4 ++--
log4j-core/src/test/resources/scripts/filter.groovy | 2 +-
log4j-core/src/test/resources/scripts/filter.js | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3c558e03/log4j-core/src/test/resources/log4j-script-filters.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-script-filters.xml b/log4j-core/src/test/resources/log4j-script-filters.xml
index 85d81d1..e2b38e0 100644
--- a/log4j-core/src/test/resources/log4j-script-filters.xml
+++ b/log4j-core/src/test/resources/log4j-script-filters.xml
@@ -29,7 +29,7 @@
var result = false;
if (logEvent.getMarker() != null && logEvent.getMarker().isInstanceOf("FLOW")) {
result = true;
- } else if (logEvent.getContextMap().containsKey("UserId")) {
+ } else if (logEvent.getContextData().containsKey("UserId")) {
result = true;
}
result;
@@ -42,7 +42,7 @@
<AppenderRef ref="List">
<ScriptFilter onMatch="ACCEPT" onMisMatch="DENY">
<Script name="GroovyFilter" language="groovy"><![CDATA[
- logEvent.marker?.isInstanceOf('FLOW') || logEvent.contextMap.containsKey('UserId')
+ logEvent.marker?.isInstanceOf('FLOW') || logEvent.contextData.containsKey('UserId')
]]>
</Script>
</ScriptFilter>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3c558e03/log4j-core/src/test/resources/scripts/filter.groovy
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/scripts/filter.groovy b/log4j-core/src/test/resources/scripts/filter.groovy
index 2beac2f..ef6998b 100644
--- a/log4j-core/src/test/resources/scripts/filter.groovy
+++ b/log4j-core/src/test/resources/scripts/filter.groovy
@@ -1 +1 @@
-return logEvent.marker?.isInstanceOf('FLOW') || logEvent.contextMap.containsKey('UserId')
+return logEvent.marker?.isInstanceOf('FLOW') || logEvent.contextData.containsKey('UserId')
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3c558e03/log4j-core/src/test/resources/scripts/filter.js
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/scripts/filter.js b/log4j-core/src/test/resources/scripts/filter.js
index 3619d5f..5d14aaf 100644
--- a/log4j-core/src/test/resources/scripts/filter.js
+++ b/log4j-core/src/test/resources/scripts/filter.js
@@ -1,7 +1,7 @@
-var result = false;
-if (logEvent.getMarker() != null && logEvent.getMarker().isInstanceOf("FLOW")) {
- result = true;
-} else if (logEvent.getContextMap().containsKey("UserId")) {
- result = true;
-}
-result;
+var result = false;
+if (logEvent.getMarker() != null && logEvent.getMarker().isInstanceOf("FLOW")) {
+ result = true;
+} else if (logEvent.getContextData().containsKey("UserId")) {
+ result = true;
+}
+result;