From ff901e6124fc38378b5da75b35dce3d4786c3940 Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Mon, 22 May 2017 14:34:35 +0000
Subject: [PATCH] SSDM-5161 : Better verbose logging for attachments
SVN: 38209
---
.../synchronizer/EntitySynchronizer.java | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
index 5fe089be8e9..81625e36960 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
@@ -239,11 +239,11 @@ public class EntitySynchronizer
verboseLogEntityOperations(builder.getDetails());
}
- // MultiKeyMap<String, String> newEntities = new MultiKeyMap<String, String>();
+ MultiKeyMap<String, String> newEntities = new MultiKeyMap<String, String>();
if (config.isDryRun() == false)
{
AtomicEntityOperationResult operationResult = service.performEntityOperations(builder.getDetails());
- // newEntities = getNewEntities(builder);
+ newEntities = getNewEntities(builder);
operationLog.info("Entity operation result: " + operationResult);
}
operationLog.info("\n");
@@ -253,8 +253,9 @@ public class EntitySynchronizer
if (config.isVerbose())
{
- verboseLogProcessAttachments(attachmentHoldersToProcess); // newEntities
+ verboseLogProcessAttachments(attachmentHoldersToProcess, newEntities);
}
+
List<String> notSyncedAttachmentsHolders = new ArrayList<String>();
if (config.isDryRun() == false)
{
@@ -348,22 +349,22 @@ public class EntitySynchronizer
}
}
- private void verboseLogProcessAttachments(List<IncomingEntity<?>> attachmentHoldersToProcess) // MultiKeyMap<String, String> newEntities
+ private void verboseLogProcessAttachments(List<IncomingEntity<?>> attachmentHoldersToProcess, MultiKeyMap<String, String> newEntities)
{
if (attachmentHoldersToProcess.isEmpty() == false)
{
operationLog.info("-------Attachments for the following entities will be processed-------");
for (IncomingEntity<?> holder : attachmentHoldersToProcess)
{
-// // the following is done to not list holders in the log when they are just being created and have no attachments
-// // updated ones will logged because the attachments might have been deleted.
-// if (newEntities.containsKey(holder.getEntityKind().getLabel(), holder.getPermID()) == true)
-// {
-// if (holder.hasAttachments() == false)
-// {
-// continue;
-// }
-// }
+ // the following is done to not list holders in the log when they are just being created and have no attachments
+ // updated ones will logged because the attachments might have been deleted.
+ if (newEntities.containsKey(holder.getEntityKind().getLabel(), holder.getPermID()) == true)
+ {
+ if (holder.hasAttachments() == false)
+ {
+ continue;
+ }
+ }
operationLog.info(holder.getIdentifer());
}
}
--
GitLab