Merge pull request #194 from lucasponce/HWKALERTS-154

HWKALERTS-154 Do not thrown Exception on BusActionPluginListener#close
hawkular · Jul 5, 2016 · 5267d90 · 5267d90
2 parents 3b09c53 + 2e656b4
commit 5267d90
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...ts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginListener.java b/...ts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates
+ * Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,11 +92,15 @@ protected void onBasicMessage(BusActionMessage basicMessage) {
     }
 
     @PreDestroy
-    public void close() throws Exception {
+    public void close() {
         Collection<ActionPluginSender> senders = ActionPlugins.getSenders().values();
         for (ActionPluginSender sender: senders) {
             if (sender instanceof BusActionPluginSender) {
-                ((BusActionPluginSender)sender).close();
+                try {
+                    ((BusActionPluginSender)sender).close();
+                } catch (Exception e) {
+                    msgLog.error("Error closing sender [" + sender.toString() + "]", e);
+                }
             }
         }
     }

diff --git a/...erts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginSender.java b/...erts-actions-bus/src/main/java/org/hawkular/alerts/actions/bus/BusActionPluginSender.java
@@ -145,4 +145,11 @@ public void send(ActionResponseMessage msg) throws Exception {
             msgLog.errorCannotSendMessage(e.getMessage());
         }
     }
+
+    @Override
+    public String toString() {
+        return "BusActionPluginSender[" +
+                "actionPlugin='" + actionPlugin + '\'' +
+                ']';
+    }
 }