From d9064f454e79d0e07dd477ef71537b399c829c6d Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Wed, 31 Aug 2016 23:14:13 -0400
Subject: [PATCH] Fix additional exception logging calls
This commit modifies a pair of exception logging calls to use
parameterized messages from Log4j.
---
.../action/support/ThreadedActionListener.java | 5 ++++-
.../org/elasticsearch/transport/netty3/Netty3Utils.java | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java b/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
index 3b14c838b0f..759693e550e 100644
--- a/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
+++ b/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
@@ -20,6 +20,8 @@
package org.elasticsearch.action.support;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.transport.TransportClient;
@@ -118,7 +120,8 @@ public final class ThreadedActionListener<Response> implements ActionListener<Re
@Override
public void onFailure(Exception e) {
- logger.warn("failed to execute failure callback on [{}], failure [{}]", e, listener, e);
+ logger.warn(
+ (Supplier<?>) () -> new ParameterizedMessage("failed to execute failure callback on [{}]", listener), e);
}
});
}
diff --git a/modules/transport-netty3/src/main/java/org/elasticsearch/transport/netty3/Netty3Utils.java b/modules/transport-netty3/src/main/java/org/elasticsearch/transport/netty3/Netty3Utils.java
index 17a367735d4..2cbf92997b4 100644
--- a/modules/transport-netty3/src/main/java/org/elasticsearch/transport/netty3/Netty3Utils.java
+++ b/modules/transport-netty3/src/main/java/org/elasticsearch/transport/netty3/Netty3Utils.java
@@ -18,6 +18,8 @@
*/
package org.elasticsearch.transport.netty3;
+import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefIterator;
import org.elasticsearch.common.SuppressForbidden;
@@ -121,7 +123,9 @@ public class Netty3Utils {
}
});
} catch (final SecurityException e) {
- Loggers.getLogger(Netty3Utils.class).debug("Unable to get/set System Property: {}", e, key);
+ Loggers
+ .getLogger(Netty3Utils.class)
+ .debug((Supplier<?>) () -> new ParameterizedMessage("Unable to get/set System Property: {}", key), e);
}
}
}