Skip to content

Commit

Permalink
fix: restructure exception handling
Browse files Browse the repository at this point in the history
  • Loading branch information
schoenenberg committed Mar 14, 2024
1 parent 2c2d257 commit c0215f3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ subprojects {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/truzzt/mds-ap3")
version = "0.2.9"
version = "0.2.10"
credentials {
username = System.getenv("USERNAME")
password = System.getenv("TOKEN")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
Expand Down Expand Up @@ -98,13 +99,13 @@ public void createProcess(ContractAgreement contractAgreement, URL clearingHouse
}

public void logContractAgreement(ContractAgreement contractAgreement, URL clearingHouseLogUrl) {
monitor.info("Logging contract agreement to LoggingHouse with contract id: " + contractAgreement.getId());
monitor.info("Logging ContractAgreement to LoggingHouse with contract id: " + contractAgreement.getId());
var logMessage = new LogMessage(clearingHouseLogUrl, connectorBaseUrl, contractAgreement);
dispatcherRegistry.dispatch(Object.class, logMessage);
}

public void logTransferProcess(TransferProcess transferProcess, URL clearingHouseLogUrl) {
monitor.info("Logging transferprocess to LoggingHouse");
monitor.info("Logging TransferProcess to LoggingHouse");
var logMessage = new LogMessage(clearingHouseLogUrl, connectorBaseUrl, transferProcess);
dispatcherRegistry.dispatch(Object.class, logMessage);
}
Expand All @@ -118,20 +119,32 @@ public <E extends Event> void on(EventEnvelope<E> event) {

// Create Process
var extendedProcessUrl = new URL(clearingHouseLogUrl + "/process/" + pid);
createProcess(contractAgreement, extendedProcessUrl);
try {
createProcess(contractAgreement, extendedProcessUrl);
} catch (Exception e) {
monitor.warning("Could not create process in LoggingHouse: " + e.getMessage());
}

// Log Contract Agreement
var extendedLogUrl = new URL(clearingHouseLogUrl + "/messages/log/" + pid);
logContractAgreement(contractAgreement, extendedLogUrl);
try {
logContractAgreement(contractAgreement, extendedLogUrl);
} catch (Exception e) {
monitor.warning("Could not log ContractNegotiation to LoggingHouse: " + e.getMessage());
}
} else if (event.getPayload() instanceof TransferProcessEvent transferProcessEvent) {
monitor.debug("Logging transfer event with id " + event.getId());

var transferProcess = resolveTransferProcess(transferProcessEvent);
var pid = transferProcess.getContractId();
var extendedUrl = new URL(clearingHouseLogUrl + "/messages/log/" + pid);
logTransferProcess(transferProcess, extendedUrl);
try {
logTransferProcess(transferProcess, extendedUrl);
} catch (Exception e) {
monitor.warning("Could not log TransferProcess to LoggingHouse: " + e.getMessage());
}
}
} catch (Exception e) {
} catch (MalformedURLException e) {
throw new EdcException("Could not create extended clearinghouse url.");
}
}
Expand Down

0 comments on commit c0215f3

Please sign in to comment.