You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2020/10/08 09:45:03 UTC
[nifi] branch main updated: NIFI-7815: Enhance the logging in
MergeContent processor
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 668c278 NIFI-7815: Enhance the logging in MergeContent processor
668c278 is described below
commit 668c278e3099598f7a42aaf6da1ce833c951fab2
Author: Peter Gyori <pe...@gmail.com>
AuthorDate: Thu Sep 17 15:51:32 2020 +0200
NIFI-7815: Enhance the logging in MergeContent processor
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #4534.
---
.../apache/nifi/processors/standard/MergeContent.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
index 0d337d8..5d4506c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
@@ -577,6 +577,15 @@ public class MergeContent extends BinFiles {
return NUMBER_PATTERN.matcher(value).matches();
}
+ private void removeFlowFileFromSession(final ProcessSession session, final FlowFile flowFile, final ProcessContext context) {
+ try {
+ session.remove(flowFile);
+ } catch (final Exception e) {
+ getLogger().error("Failed to remove merged FlowFile from the session after merge failure during \""
+ + context.getProperty(MERGE_FORMAT).getValue() + "\" merge.", e);
+ }
+ }
+
private class BinaryConcatenationMerge implements MergeBin {
private String mimeType = "application/octet-stream";
@@ -636,7 +645,7 @@ public class MergeContent extends BinFiles {
}
});
} catch (final Exception e) {
- session.remove(bundle);
+ removeFlowFileFromSession(session, bundle, context);
throw e;
}
@@ -781,7 +790,7 @@ public class MergeContent extends BinFiles {
}
});
} catch (final Exception e) {
- session.remove(bundle);
+ removeFlowFileFromSession(session, bundle, context);
throw e;
}
@@ -848,7 +857,7 @@ public class MergeContent extends BinFiles {
}
});
} catch (final Exception e) {
- session.remove(bundle);
+ removeFlowFileFromSession(session, bundle, context);
throw e;
}
@@ -918,7 +927,7 @@ public class MergeContent extends BinFiles {
}
});
} catch (final Exception e) {
- session.remove(bundle);
+ removeFlowFileFromSession(session, bundle, context);
throw e;
}
@@ -1042,7 +1051,7 @@ public class MergeContent extends BinFiles {
}
});
} catch (final Exception e) {
- session.remove(bundle);
+ removeFlowFileFromSession(session, bundle, context);
throw e;
}