fix: Remove exception from close method (#3)

extenda · Nov 10, 2023 · c5dbd6f · c5dbd6f
1 parent 724784c
commit c5dbd6f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/com/retailsvc/gcp/pubsub/PubSubClient.java b/src/main/java/com/retailsvc/gcp/pubsub/PubSubClient.java
@@ -24,4 +24,7 @@ void publish(Object payloadObject, Map<String, String> attributesMap)
    * @return True if client has been closed, false otherwise.
    */
   boolean isClosed();
+
+  @Override
+  void close();
 }
diff --git a/src/main/java/com/retailsvc/gcp/pubsub/PubSubClientImpl.java b/src/main/java/com/retailsvc/gcp/pubsub/PubSubClientImpl.java
@@ -88,13 +88,18 @@ protected void publish(ByteString payload, Map<String, String> attributes) {
   }
 
   @Override
-  public void close() throws Exception {
-    Integer timeout =
-        Optional.ofNullable(System.getenv(PUBSUB_CLOSE_TIMEOUT_SECONDS))
-            .map(Integer::parseInt)
-            .orElse(DEFAULT_CLOSE_TIMEOUT);
-    this.isClosed.set(true);
-    publisher.shutdown();
-    publisher.awaitTermination(timeout, TimeUnit.SECONDS);
+  public void close() {
+    try {
+      Integer timeout =
+          Optional.ofNullable(System.getenv(PUBSUB_CLOSE_TIMEOUT_SECONDS))
+              .map(Integer::parseInt)
+              .orElse(DEFAULT_CLOSE_TIMEOUT);
+      this.isClosed.set(true);
+      publisher.shutdown();
+      publisher.awaitTermination(timeout, TimeUnit.SECONDS);
+    } catch (InterruptedException ignored) {
+      Thread.currentThread().interrupt();
+      LOG.error("Interrupted while closing client");
+    }
   }
 }