From f0799e255a582a61ca9de1eb715af8b9849cc81a Mon Sep 17 00:00:00 2001 From: Rodolfo Silva Date: Mon, 7 Aug 2023 10:50:32 -0300 Subject: fix: remove AMQP auto close connection --- src/main/java/org/traccar/forward/AmqpClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/traccar/forward/AmqpClient.java') diff --git a/src/main/java/org/traccar/forward/AmqpClient.java b/src/main/java/org/traccar/forward/AmqpClient.java index 302aa664c..361cfffee 100644 --- a/src/main/java/org/traccar/forward/AmqpClient.java +++ b/src/main/java/org/traccar/forward/AmqpClient.java @@ -43,7 +43,8 @@ public class AmqpClient { throw new RuntimeException("Error while setting URI for RabbitMQ connection factory", e); } - try (Connection connection = factory.newConnection()) { + try { + Connection connection = factory.newConnection(); channel = connection.createChannel(); channel.exchangeDeclare(exchange, BuiltinExchangeType.TOPIC, true); } catch (IOException | TimeoutException e) { -- cgit v1.2.3 From ac2ca17894da7fd43432c63056f6abef4a7a611b Mon Sep 17 00:00:00 2001 From: Rodolfo Silva Date: Mon, 7 Aug 2023 12:05:06 -0300 Subject: fix: add shutdown hook to close the AMQP connection --- src/main/java/org/traccar/forward/AmqpClient.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/java/org/traccar/forward/AmqpClient.java') diff --git a/src/main/java/org/traccar/forward/AmqpClient.java b/src/main/java/org/traccar/forward/AmqpClient.java index 361cfffee..8ac618f5c 100644 --- a/src/main/java/org/traccar/forward/AmqpClient.java +++ b/src/main/java/org/traccar/forward/AmqpClient.java @@ -47,6 +47,13 @@ public class AmqpClient { Connection connection = factory.newConnection(); channel = connection.createChannel(); channel.exchangeDeclare(exchange, BuiltinExchangeType.TOPIC, true); + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + try { + connection.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + })); } catch (IOException | TimeoutException e) { throw new RuntimeException("Error while creating and configuring RabbitMQ channel", e); } -- cgit v1.2.3 From 78ead877bac40cd88fc342e966741b42568de5a5 Mon Sep 17 00:00:00 2001 From: Rodolfo Silva Date: Mon, 7 Aug 2023 16:47:56 -0300 Subject: fix: remove the AmqpClient shutdown hook --- src/main/java/org/traccar/forward/AmqpClient.java | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/main/java/org/traccar/forward/AmqpClient.java') diff --git a/src/main/java/org/traccar/forward/AmqpClient.java b/src/main/java/org/traccar/forward/AmqpClient.java index 8ac618f5c..361cfffee 100644 --- a/src/main/java/org/traccar/forward/AmqpClient.java +++ b/src/main/java/org/traccar/forward/AmqpClient.java @@ -47,13 +47,6 @@ public class AmqpClient { Connection connection = factory.newConnection(); channel = connection.createChannel(); channel.exchangeDeclare(exchange, BuiltinExchangeType.TOPIC, true); - Runtime.getRuntime().addShutdownHook(new Thread(() -> { - try { - connection.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - })); } catch (IOException | TimeoutException e) { throw new RuntimeException("Error while creating and configuring RabbitMQ channel", e); } -- cgit v1.2.3