Skip to content

Commit a3580b6

Browse files
feat: avoid InterruptedException and rename
Signed-off-by: Joris Mancini <[email protected]>
1 parent f1b06a7 commit a3580b6

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/main/java/org/gridsuite/modification/server/service/BuildWorkerService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void startBuild(BuildExecContext execContext) {
110110
BuildInfos buildInfos = execContext.getBuildInfos();
111111
CompletableFuture<NetworkModificationResult> future = execBuildVariant(execContext, buildInfos);
112112
NetworkModificationResult result;
113-
if (future != null && (result = future.get()) != null) { // result available
113+
if (future != null && (result = future.join()) != null) { // result available
114114
notificationService.emitBuildResultMessage(result, execContext.getReceiver());
115115
LOGGER.info("Build complete on node '{}'", execContext.getReceiver());
116116
} else { // result not available : stop build request
@@ -120,8 +120,6 @@ private void startBuild(BuildExecContext execContext) {
120120
}
121121
} catch (CancellationException e) {
122122
stoppedPublisherService.publishCancel(execContext.getReceiver(), CANCEL_MESSAGE);
123-
} catch (InterruptedException e) {
124-
Thread.currentThread().interrupt();
125123
} catch (Exception e) {
126124
throw new BuildException("Node build failed", e);
127125
} finally {

src/main/resources/config/application.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ spring:
3939
consumer:
4040
auto-bind-dlq: true
4141
dead-letter-exchange: ${powsybl-ws.rabbitmq.destination.prefix:}build.run.dlx
42-
dead-letter-routing-key: "#"
43-
dead-letter-queue-name: ${powsybl-ws.rabbitmq.destination.prefix:}build.run.dlq
42+
dead-letter-queue-name: ${powsybl-ws.rabbitmq.destination.prefix:}build.run.dlx.dlq
43+
dead-letter-exchange-type: topic
4444
quorum:
4545
enabled: true
4646
delivery-limit: 2

0 commit comments

Comments
 (0)