From 5cfa312f7defa052b2149fe40ab7bb7c588ff94e Mon Sep 17 00:00:00 2001 From: Bruno Thomas Date: Tue, 3 Dec 2024 17:26:21 +0000 Subject: [PATCH] chore: format/refactor log --- .../src/main/java/org/icij/datashare/TaskWorkerApp.java | 6 +----- .../java/org/icij/datashare/asynctasks/TaskWorkerLoop.java | 3 --- .../org/icij/datashare/asynctasks/bus/amqp/AmqpChannel.java | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/datashare-app/src/main/java/org/icij/datashare/TaskWorkerApp.java b/datashare-app/src/main/java/org/icij/datashare/TaskWorkerApp.java index 32b701f80..b96028e05 100644 --- a/datashare-app/src/main/java/org/icij/datashare/TaskWorkerApp.java +++ b/datashare-app/src/main/java/org/icij/datashare/TaskWorkerApp.java @@ -1,13 +1,9 @@ package org.icij.datashare; -import com.rabbitmq.client.AMQP; -import org.icij.datashare.asynctasks.TaskWorkerLoop; import org.icij.datashare.asynctasks.TaskSupplier; -import org.icij.datashare.asynctasks.bus.amqp.AmqpInterlocutor; +import org.icij.datashare.asynctasks.TaskWorkerLoop; import org.icij.datashare.mode.CommonMode; import org.icij.datashare.tasks.DatashareTaskFactory; -import org.icij.datashare.text.indexing.Indexer; -import org.redisson.api.RedissonClient; import java.util.Properties; diff --git a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskWorkerLoop.java b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskWorkerLoop.java index 8e04cb566..ea28e89a4 100644 --- a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskWorkerLoop.java +++ b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/TaskWorkerLoop.java @@ -1,8 +1,5 @@ package org.icij.datashare.asynctasks; -import com.rabbitmq.client.AMQP; -import com.rabbitmq.client.ShutdownSignalException; -import org.icij.datashare.asynctasks.bus.amqp.AmqpChannel; import org.icij.datashare.asynctasks.bus.amqp.CancelEvent; import org.icij.datashare.asynctasks.bus.amqp.CancelledEvent; import org.icij.datashare.asynctasks.bus.amqp.ShutdownEvent; diff --git a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/bus/amqp/AmqpChannel.java b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/bus/amqp/AmqpChannel.java index 5f3e1240b..3182e219e 100644 --- a/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/bus/amqp/AmqpChannel.java +++ b/datashare-tasks/src/main/java/org/icij/datashare/asynctasks/bus/amqp/AmqpChannel.java @@ -88,7 +88,7 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp logger.warn("exception while deserializing json. Sending nack without requeue", jsonException); rabbitMqChannel.basicNack(envelope.getDeliveryTag(), false, false); } catch (NackException nackEx) { - logger.warn("exception while accepting event. Sending nack with requeue=" + nackEx.requeue, nackEx); + logger.warn("exception while accepting event. Sending nack with requeue={}", nackEx.requeue, nackEx); rabbitMqChannel.basicNack(envelope.getDeliveryTag(), false, nackEx.requeue); } criteria.newEvent();