From 760ff8a68d64c86751f2c22f1595008f29c24310 Mon Sep 17 00:00:00 2001 From: Henning Andersen Date: Wed, 11 Dec 2019 16:09:12 +0100 Subject: [PATCH 1/2] Log attachment generation failures Watcher logs when actions fail in `ActionWrapper`, but failures to generate an attachment are not logged and we thus only know the type of the exception and not where/how it occurred. --- .../xpack/watcher/actions/email/ExecutableEmailAction.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java index fcc4eb0e9422b..6b8c74600e7e0 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java @@ -6,6 +6,7 @@ package org.elasticsearch.xpack.watcher.actions.email; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.xpack.core.watcher.actions.Action; import org.elasticsearch.xpack.core.watcher.actions.ExecutableAction; @@ -23,6 +24,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.function.Supplier; public class ExecutableEmailAction extends ExecutableAction { @@ -57,6 +59,8 @@ public Action.Result execute(String actionId, WatchExecutionContext ctx, Payload Attachment attachment = parser.toAttachment(ctx, payload, emailAttachment); attachments.put(attachment.id(), attachment); } catch (ElasticsearchException | IOException e) { + logger().error( + (Supplier) () -> new ParameterizedMessage("failed to execute action [{}/{}]", ctx.watch().id(), actionId), e); return new EmailAction.Result.FailureWithException(action.type(), e); } } From 116c079de8bbbbf14285c2893c741fda21696fda Mon Sep 17 00:00:00 2001 From: Henning Andersen Date: Wed, 11 Dec 2019 16:26:36 +0100 Subject: [PATCH 2/2] Wrong supplier. --- .../xpack/watcher/actions/email/ExecutableEmailAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java index 6b8c74600e7e0..1f8e87cad1f95 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/actions/email/ExecutableEmailAction.java @@ -7,6 +7,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; +import org.apache.logging.log4j.util.Supplier; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.xpack.core.watcher.actions.Action; import org.elasticsearch.xpack.core.watcher.actions.ExecutableAction; @@ -24,7 +25,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.function.Supplier; public class ExecutableEmailAction extends ExecutableAction {