From d3f0ef683771cf3038a807e604c7fa28e0eba4ab Mon Sep 17 00:00:00 2001 From: gexce Date: Fri, 24 Nov 2017 14:00:30 +0100 Subject: [PATCH] final commit --- .../resources/application.properties | 2 +- .../edam/migration/MamMigrationSelective.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/AH MAM Migration/resources/application.properties b/AH MAM Migration/resources/application.properties index d871d72..07c37e5 100644 --- a/AH MAM Migration/resources/application.properties +++ b/AH MAM Migration/resources/application.properties @@ -2,4 +2,4 @@ logging.level.com.bayer=DEBUG #logging.level.com.bayer.edam.migration.interceptors=INFO logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} %-5level- %msg%n -logging.file=application_2017-11-21_PROD.log +logging.file=application_2017-11-24_PROD.log diff --git a/AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java b/AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java index 9a7f94b..e761802 100644 --- a/AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java +++ b/AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java @@ -168,8 +168,10 @@ public class MamMigrationSelective implements CommandLineRunner { // XXX // if needed start from a certain ID - if (id > 71715) + if (id > 27834) { + skippedCounter++; continue; + } // refresh login every 4 hours if (System.currentTimeMillis() - lastLogin > 14400000) @@ -733,7 +735,7 @@ public class MamMigrationSelective implements CommandLineRunner { } else { // TODO - log.error("File too large, could not upload " + file.getName() + " for " + recordLocation); + log.error("File too large, could not upload " + file.getAbsolutePath() + (isMaster ? " (master)" : "") + " for " + recordLocation); } } else { @@ -775,7 +777,8 @@ public class MamMigrationSelective implements CommandLineRunner { processedReferences.add(reference); } else { - log.debug("Checking status of " + reference.cachePath + " for " + reference.targetRecord + " at " + reference.uri); + log.debug("Checking status of " + reference.cachePath + (reference.isMaster ? " (master)" : "") + " for " + + reference.targetRecord + " at " + reference.uri); try { UploadResult result = restTemplate .exchange(Definitions.adamHost + reference.uri, HttpMethod.GET, adamHeadersEntity, UploadResult.class) @@ -787,15 +790,16 @@ public class MamMigrationSelective implements CommandLineRunner { reference.token = result.token; } else if (result.status != null) { if (result.status.equals("Error")) { - log.error("System could not process file " + reference.cachePath + " for " + reference.targetRecord); + log.error("System could not process file " + reference.cachePath + (reference.isMaster ? " (master)" : "") + " for " + reference.targetRecord); processedReferences.add(reference); } } } catch (HttpClientErrorException hcee) { - log.error("Failed to check status of " + reference.cachePath + " for " + reference.targetRecord + ", Exception: " - + hcee.getMessage() + ", " + hcee.getResponseBodyAsString()); + log.error("Failed to check status of " + reference.cachePath + (reference.isMaster ? " (master)" : "") + " for " + + reference.targetRecord + ", Exception: " + hcee.getMessage() + ", " + hcee.getResponseBodyAsString()); } catch (RestClientException rce) { - log.error("Failed to check status of " + reference.cachePath + " for " + reference.targetRecord + ": " + rce.getMessage()); + log.error("Failed to check status of " + reference.cachePath + (reference.isMaster ? " (master)" : "") + " for " + + reference.targetRecord + ": " + rce.getMessage()); } } }