tilman/mam-migration
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final commit

Browse Source
This commit is contained in:
gexce
2017-11-24 14:00:30 +01:00
parent a12c41c776
commit d3f0ef6837
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AH MAM Migration/resources/application.properties
+1 -1
View File
@@ -2,4 +2,4 @@
logging.level.com.bayer=DEBUG logging.level.com.bayer=DEBUG
#logging.level.com.bayer.edam.migration.interceptors=INFO #logging.level.com.bayer.edam.migration.interceptors=INFO
logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} %-5level- %msg%n 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
AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java
+11 -7
View File
@@ -168,8 +168,10 @@ public class MamMigrationSelective implements CommandLineRunner {
// XXX // XXX
// if needed start from a certain ID // if needed start from a certain ID
if (id > 71715) if (id > 27834) {
skippedCounter++;
continue; continue;
}
// refresh login every 4 hours // refresh login every 4 hours
if (System.currentTimeMillis() - lastLogin > 14400000) if (System.currentTimeMillis() - lastLogin > 14400000)
@@ -733,7 +735,7 @@ public class MamMigrationSelective implements CommandLineRunner {
} }
else { else {
// TODO // 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 { else {
@@ -775,7 +777,8 @@ public class MamMigrationSelective implements CommandLineRunner {
processedReferences.add(reference); processedReferences.add(reference);
} }
else { 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 { try {
UploadResult result = restTemplate UploadResult result = restTemplate
.exchange(Definitions.adamHost + reference.uri, HttpMethod.GET, adamHeadersEntity, UploadResult.class) .exchange(Definitions.adamHost + reference.uri, HttpMethod.GET, adamHeadersEntity, UploadResult.class)
@@ -787,15 +790,16 @@ public class MamMigrationSelective implements CommandLineRunner {
reference.token = result.token; reference.token = result.token;
} else if (result.status != null) { } else if (result.status != null) {
if (result.status.equals("Error")) { 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); processedReferences.add(reference);
} }
} }
} catch (HttpClientErrorException hcee) { } catch (HttpClientErrorException hcee) {
log.error("Failed to check status of " + reference.cachePath + " for " + reference.targetRecord + ", Exception: " log.error("Failed to check status of " + reference.cachePath + (reference.isMaster ? " (master)" : "") + " for "
+ hcee.getMessage() + ", " + hcee.getResponseBodyAsString()); + reference.targetRecord + ", Exception: " + hcee.getMessage() + ", " + hcee.getResponseBodyAsString());
} catch (RestClientException rce) { } 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());
} }
} }
} }