Skip to content

BITMAG-1055: Cleaning up file-exchange after audit trail preservation #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-atlantis merged 1 commit into from
Aug 31, 2022
Merged

BITMAG-1055: Cleaning up file-exchange after audit trail preservation #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...rvice/src/main/java/org/bitrepository/audittrails/preserver/LocalAuditTrailPreserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Date;
import java.util.HashMap;
Expand Down Expand Up @@ -164,18 +165,24 @@ private synchronized void performAuditTrailPreservation(String collectionID) {
File auditPackage = auditPacker.createNewPackage().toFile();

if (auditPacker.getPackedAuditCount() > 0) {
URL url = uploadFile(auditPackage);
log.info("Uploaded the file '{}' to '{}'", auditPackage, url.toExternalForm());
URL fileURL = uploadFile(auditPackage);
log.info("Uploaded the file '{}' to '{}'", auditPackage, fileURL.toExternalForm());

ChecksumDataForFileTYPE checksumData = getValidationChecksumDataForFile(auditPackage);

EventHandler eventHandler = new AuditPreservationEventHandler(auditPacker.getSequenceNumbersReached(),
store, collectionID);
client.putFile(preservationSettings.getAuditTrailPreservationCollection(), url, auditPackage.getName(),
client.putFile(preservationSettings.getAuditTrailPreservationCollection(), fileURL, auditPackage.getName(),
auditPackage.length(), checksumData, null, eventHandler,
"Preservation of audit trails from the AuditTrail service.");

preservedAuditCount += auditPacker.getPackedAuditCount();

try {
exchange.deleteFile(fileURL);
} catch (IOException | URISyntaxException e) {
log.error("Failed cleaning up file '{}' at {}", auditPackage.getName(), fileURL.toExternalForm());
}
} else {
log.info("No new audit trails to preserve for collection '{}'. No preservation file uploaded.",
collectionID);
Expand Down