From d7170197f69ed0845b0fb13d939efda6e5b12afe Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 19 Feb 2016 05:52:35 -0800 Subject: [PATCH] Handle core's log refactoring Original commit: elastic/x-pack-elasticsearch@9e2e41db9006e704f504bc4be61385257e01124f --- .../license/plugin/core/LicensesService.java | 2 +- .../marvel/license/MarvelLicensee.java | 2 +- ...cumentLevelSecurityRequestInterceptor.java | 3 +- .../accesscontrol/DocumentSubsetReader.java | 2 +- .../accesscontrol/FieldSubsetReader.java | 2 +- .../ShieldIndexSearcherWrapper.java | 2 +- .../shield/support/NoOpLogger.java | 5 +- .../shield/audit/logfile/CapturingLogger.java | 71 +++++++------------ .../org/elasticsearch/watcher/Watcher.java | 2 +- .../elasticsearch/watcher/actions/Action.java | 2 +- .../watcher/actions/throttler/Throttler.java | 2 +- .../watcher/execution/ExecutionService.java | 2 +- .../watcher/support/Exceptions.java | 2 +- .../support/validation/Validation.java | 2 +- .../validation/WatcherSettingsValidation.java | 2 +- .../chain/ExecutableChainTransform.java | 2 +- 16 files changed, 42 insertions(+), 63 deletions(-) diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java index 731dbfd194e..0eef01be0ea 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.inject.Singleton; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/license/MarvelLicensee.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/license/MarvelLicensee.java index 79896e19e3d..1a56f2521f5 100644 --- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/license/MarvelLicensee.java +++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/license/MarvelLicensee.java @@ -7,7 +7,7 @@ package org.elasticsearch.marvel.license; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.license.core.License; import org.elasticsearch.license.plugin.core.AbstractLicenseeComponent; diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java index fa55e5d714c..ba85735056b 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/action/interceptor/FieldAndDocumentLevelSecurityRequestInterceptor.java @@ -8,13 +8,12 @@ package org.elasticsearch.shield.action.interceptor; import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.common.component.AbstractComponent; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.shield.User; import org.elasticsearch.shield.authz.InternalAuthorizationService; import org.elasticsearch.shield.authz.accesscontrol.IndicesAccessControl; -import org.elasticsearch.transport.TransportRequest; import java.util.Collections; import java.util.List; diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/DocumentSubsetReader.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/DocumentSubsetReader.java index 9d4a39a1c8f..6877054d43b 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/DocumentSubsetReader.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/DocumentSubsetReader.java @@ -16,7 +16,7 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.Bits; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.index.cache.bitset.BitsetFilterCache; import java.io.IOException; diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/FieldSubsetReader.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/FieldSubsetReader.java index 5d78a95fa3b..4d08c1b9aff 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/FieldSubsetReader.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/FieldSubsetReader.java @@ -26,7 +26,7 @@ import org.apache.lucene.util.FilterIterator; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapper.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapper.java index acbea6eeddf..8cc2410a40b 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapper.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/ShieldIndexSearcherWrapper.java @@ -24,8 +24,8 @@ import org.apache.lucene.util.SparseFixedBitSet; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.logging.ESLogger; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.cache.bitset.BitsetFilterCache; diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/support/NoOpLogger.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/support/NoOpLogger.java index f5e3196c4c8..f5d5cc3376d 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/support/NoOpLogger.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/support/NoOpLogger.java @@ -8,13 +8,14 @@ package org.elasticsearch.shield.support; import org.elasticsearch.common.logging.ESLogger; /** - * + * A logger that doesn't log anything. */ -public class NoOpLogger implements ESLogger { +public class NoOpLogger extends ESLogger { public static final ESLogger INSTANCE = new NoOpLogger(); private NoOpLogger() { + super(null, null); } @Override diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/logfile/CapturingLogger.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/logfile/CapturingLogger.java index 3aff53c8c16..d5846d52428 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/logfile/CapturingLogger.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/logfile/CapturingLogger.java @@ -5,16 +5,18 @@ */ package org.elasticsearch.shield.audit.logfile; -import org.elasticsearch.common.logging.support.AbstractESLogger; +import org.elasticsearch.common.logging.ESLogger; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import static org.elasticsearch.common.logging.LoggerMessageFormat.format; + /** * */ -public class CapturingLogger extends AbstractESLogger { +public class CapturingLogger extends ESLogger { private Level level; @@ -25,58 +27,43 @@ public class CapturingLogger extends AbstractESLogger { public final List trace = new ArrayList<>(); public CapturingLogger(Level level) { - super(""); + super(null, null); this.level = level; } @Override - protected void internalTrace(String msg) { - add(trace, msg); + public void trace(String msg, Throwable cause, Object... params) { + if (isTraceEnabled()) { + add(trace, format(msg, params), cause); + } } @Override - protected void internalTrace(String msg, Throwable cause) { - add(trace, msg, cause); + public void debug(String msg, Throwable cause, Object... params) { + if (isDebugEnabled()) { + add(debug, format(msg, params), cause); + } } @Override - protected void internalDebug(String msg) { - add(debug, msg); + public void info(String msg, Throwable cause, Object... params) { + if (isInfoEnabled()) { + add(info, format(msg, params), cause); + } } @Override - protected void internalDebug(String msg, Throwable cause) { - add(debug, msg, cause); + public void warn(String msg, Throwable cause, Object... params) { + if (isWarnEnabled()) { + add(warn, format(msg, params), cause); + } } @Override - protected void internalInfo(String msg) { - add(info, msg); - } - - @Override - protected void internalInfo(String msg, Throwable cause) { - add(info, msg, cause); - } - - @Override - protected void internalWarn(String msg) { - add(warn, msg); - } - - @Override - protected void internalWarn(String msg, Throwable cause) { - add(warn, msg, cause); - } - - @Override - protected void internalError(String msg) { - add(error, msg); - } - - @Override - protected void internalError(String msg, Throwable cause) { - add(error, msg, cause); + public void error(String msg, Throwable cause, Object... params) { + if (isErrorEnabled()) { + add(error, format(msg, params), cause); + } } @Override @@ -135,10 +122,6 @@ public class CapturingLogger extends AbstractESLogger { } } - private static void add(List list, String text) { - list.add(new Msg(text)); - } - private static void add(List list, String text, Throwable t) { list.add(new Msg(text, t)); } @@ -151,10 +134,6 @@ public class CapturingLogger extends AbstractESLogger { public String text; public Throwable t; - public Msg(String text) { - this.text = text; - } - public Msg(String text, Throwable t) { this.text = text; this.t = t; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java index 538f20953a0..2538c7fc719 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/Watcher.java @@ -13,8 +13,8 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.logging.ESLogger; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Setting; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java index d1dde257771..8fdc640f341 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/Action.java @@ -6,7 +6,7 @@ package org.elasticsearch.watcher.actions; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java index bbcd63b1840..d8cf37b3836 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/actions/throttler/Throttler.java @@ -6,7 +6,7 @@ package org.elasticsearch.watcher.actions.throttler; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.watcher.execution.WatchExecutionContext; /** diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java index ae93d02f9fb..9d58bc01b7f 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/execution/ExecutionService.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static org.elasticsearch.common.logging.support.LoggerMessageFormat.format; +import static org.elasticsearch.common.logging.LoggerMessageFormat.format; /** */ diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java index aae34da88e1..93d5d7aa191 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/Exceptions.java @@ -10,7 +10,7 @@ import org.elasticsearch.script.ScriptException; import java.io.IOException; -import static org.elasticsearch.common.logging.support.LoggerMessageFormat.format; +import static org.elasticsearch.common.logging.LoggerMessageFormat.format; /** * diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java index cb2845c9d83..ca1ee574b29 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/Validation.java @@ -5,7 +5,7 @@ */ package org.elasticsearch.watcher.support.validation; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import java.util.regex.Pattern; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java index bc08c36947c..14fae2a9b3e 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/support/validation/WatcherSettingsValidation.java @@ -8,7 +8,7 @@ package org.elasticsearch.watcher.support.validation; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.common.logging.support.LoggerMessageFormat; +import org.elasticsearch.common.logging.LoggerMessageFormat; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.watcher.support.Exceptions; diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java index f56eb248ca0..ee03a350e0b 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/transform/chain/ExecutableChainTransform.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.elasticsearch.common.logging.support.LoggerMessageFormat.format; +import static org.elasticsearch.common.logging.LoggerMessageFormat.format; /** *