Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-7815: Enhance the logging in MergeContent processor 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #4534.
This commit is contained in:
Peter Gyori 2020-09-17 15:51:32 +02:00 committed by Pierre Villard
parent dee2fcedfe
commit 668c278e30
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
View File

@ -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;
}