Skip to content

Commit

Permalink
Add logging
Browse files Browse the repository at this point in the history
  • Loading branch information
sree-cfa committed Feb 6, 2024
1 parent 46fa14d commit af84e34
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/main/java/org/ladocuploader/app/cli/SubmissionTransfer.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.ladocuploader.app.data.enums.TransmissionStatus;
import org.ladocuploader.app.data.enums.TransmissionType;
import org.ladocuploader.app.submission.StringEncryptor;
import org.slf4j.MDC;
import org.springframework.data.domain.Sort;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -114,6 +115,8 @@ private void transferSubmissionBatch(List<Submission> submissionsBatch) {
String batchIndex = Strings.padStart(batchSeq, BATCH_INDEX_LEN, '0');
UUID uuid = UUID.randomUUID();
String zipFileName = batchIndex + ".zip";
MDC.put("batchIndex", batchIndex);
MDC.put("run_id", uuid.toString());
log.info(String.format("Beginning transfer of %s: batch %s", uuid, batchIndex));

// Stats on transfers
Expand All @@ -125,8 +128,9 @@ private void transferSubmissionBatch(List<Submission> submissionsBatch) {
StringBuilder docMeta = new StringBuilder();
for (Submission submission : submissionsBatch) {
Transmission transmission = transmissionRepository.findBySubmissionAndTransmissionType(submission, TransmissionType.SNAP);

String subfolder = Integer.toString(subfolderidx++);
MDC.put("submissionId", submission.getId().toString());
MDC.put("transmissionId", transmission.getTransmission_id().toString());
try {
log.info("Verifying required fields");
verifyRequiredFieldsArePresent(submission.getInputData());
Expand All @@ -145,6 +149,8 @@ private void transferSubmissionBatch(List<Submission> submissionsBatch) {
updateTransmission(uuid, transmission);
failed++;
}
MDC.remove("submissionId");
MDC.remove("transmissionId");
}

// Add metadata entry to zip
Expand Down Expand Up @@ -175,7 +181,10 @@ private void transferSubmissionBatch(List<Submission> submissionsBatch) {
updateTransmission(uuid, transmission);
}

MDC.put("successful", String.valueOf(successfulTransmissions.size()));
MDC.put("failed", String.valueOf(failed));
log.info(String.format("Completed transfer of batch %s, total %s, successful %s, failed %s", batchIndex, subfolderidx - 1, successfulTransmissions.size(), failed));
MDC.clear();
}

private void verifyRequiredFieldsArePresent(Map<String, Object> inputData) {
Expand Down

0 comments on commit af84e34

Please sign in to comment.