summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-07-23 13:00:25 +0200
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-07-28 15:01:17 +0200
commitcfc1a64f0ec5e29ea11dd769bb7ef560f5491202 (patch)
treebb831dfc5209f8842cdeab6f136bb5e714c7dff7
parenta4638a48f6b369c3913e464bd73a952427d74c4a (diff)
Add log when file is skipped because it was already published
Issue-ID: DCAEGEN2-2366 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: I913b887833e412dd9c0093936a9231d37f63e7d1
-rw-r--r--datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java27
1 files changed, 18 insertions, 9 deletions
diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
index de45da31..42a6fea3 100644
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
@@ -220,17 +220,26 @@ public class ScheduledTasks {
private boolean shouldBePublished(FileDataWithContext fileData) {
Path localFilePath = fileData.fileData.getLocalFilePath();
- if (publishedFilesCache.put(localFilePath) == null) {
- try {
- return !createPublishedChecker().isFilePublished(fileData.fileData.name(),
+ boolean shouldBePublished = (publishedFilesCache.put(localFilePath) == null);
+ if (shouldBePublished) {
+ shouldBePublished = checkIfFileIsNotPublishedInDataRouter(fileData);
+ }
+
+ if (!shouldBePublished) {
+ logger.debug("File: {} is being processed or was already published. Skipping.", fileData.fileData.name());
+ }
+ return shouldBePublished;
+ }
+
+ private boolean checkIfFileIsNotPublishedInDataRouter(FileDataWithContext fileData) {
+ boolean isNotPublished = true;
+ try {
+ isNotPublished = !createPublishedChecker().isFilePublished(fileData.fileData.name(),
fileData.fileData.messageMetaData().changeIdentifier(), fileData.context);
- } catch (DatafileTaskException e) {
- logger.error("Cannot check if a file {} is published", fileData.fileData.name(), e);
- return true; // Publish it then
- }
- } else {
- return false;
+ } catch (DatafileTaskException e) {
+ logger.error("Cannot check if a file {} is published", fileData.fileData.name(), e);
}
+ return isNotPublished;
}
private Mono<FilePublishInformation> fetchFile(FileDataWithContext fileData) {