Merge pull request #65 from lucasponce/HWKALERTS-63

HWKALERTS-63 Fix for bus connection not properly closed
hawkular · Jun 30, 2015 · 0b1db1a · 0b1db1a
2 parents db667a9 + 5145e0e
commit 0b1db1a
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 0 deletions.
diff --git a/...actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java b/...actions-email/src/main/java/org/hawkular/actions/email/registration/RegistrationInit.java
@@ -16,6 +16,7 @@
  */
 package org.hawkular.actions.email.registration;
 
+import java.io.IOException;
 import org.hawkular.bus.common.ConnectionContextFactory;
 import org.hawkular.bus.common.Endpoint;
 import org.hawkular.bus.common.MessageId;
@@ -73,6 +74,18 @@ public void init() {
         } catch (JMSException e) {
             log.debug(e.getMessage(), e);
             msgLog.errorCannotSendMessage("email", e.getMessage());
+        } finally {
+            if (pcc != null) {
+                try {
+                    pcc.close();
+                    pcc = null;
+                } catch (IOException ignored) { }
+            }
+            if (ccf != null) {
+                try {
+                    ccf.close();
+                } catch (JMSException ignored) { }
+            }
         }
     }
 }
diff --git a/...pagerduty/src/main/java/org/hawkular/actions/pagerduty/registration/RegistrationInit.java b/...pagerduty/src/main/java/org/hawkular/actions/pagerduty/registration/RegistrationInit.java
@@ -16,6 +16,7 @@
  */
 package org.hawkular.actions.pagerduty.registration;
 
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -72,6 +73,18 @@ public void init() {
         } catch (JMSException e) {
             log.debug(e.getMessage(), e);
             msgLog.errorCannotSendMessage("pagerduty", e.getMessage());
+        } finally {
+            if (pcc != null) {
+                try {
+                    pcc.close();
+                    pcc = null;
+                } catch (IOException ignored) { }
+            }
+            if (ccf != null) {
+                try {
+                    ccf.close();
+                } catch (JMSException ignored) { }
+            }
         }
     }
 }
diff --git a/...lar-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java b/...lar-actions-sms/src/main/java/org/hawkular/actions/sms/registration/RegistrationInit.java
@@ -16,6 +16,7 @@
  */
 package org.hawkular.actions.sms.registration;
 
+import java.io.IOException;
 import org.hawkular.bus.common.ConnectionContextFactory;
 import org.hawkular.bus.common.Endpoint;
 import org.hawkular.bus.common.MessageId;
@@ -72,6 +73,18 @@ public void init() {
         } catch (JMSException e) {
             log.debug(e.getMessage(), e);
             msgLog.errorCannotSendMessage("sms", e.getMessage());
+        } finally {
+            if (pcc != null) {
+                try {
+                    pcc.close();
+                    pcc = null;
+                } catch (IOException ignored) { }
+            }
+            if (ccf != null) {
+                try {
+                    ccf.close();
+                } catch (JMSException ignored) { }
+            }
         }
     }
 }
diff --git a/...r-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java b/...r-actions-snmp/src/main/java/org/hawkular/actions/snmp/registration/RegistrationInit.java
@@ -16,6 +16,7 @@
  */
 package org.hawkular.actions.snmp.registration;
 
+import java.io.IOException;
 import org.hawkular.bus.common.ConnectionContextFactory;
 import org.hawkular.bus.common.Endpoint;
 import org.hawkular.bus.common.MessageId;
@@ -74,6 +75,18 @@ public void init() {
         } catch (JMSException e) {
             log.debug(e.getMessage(), e);
             msgLog.errorCannotSendMessage("snmp", e.getMessage());
+        } finally {
+            if (pcc != null) {
+                try {
+                    pcc.close();
+                    pcc = null;
+                } catch (IOException ignored) { }
+            }
+            if (ccf != null) {
+                try {
+                    ccf.close();
+                } catch (JMSException ignored) { }
+            }
         }
     }
 }
diff --git a/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java b/hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.bus.sender;
 
+import java.io.IOException;
+import javax.jms.JMSException;
 import org.hawkular.alerts.api.model.action.Action;
 import org.hawkular.alerts.api.services.DefinitionsService;
 import org.hawkular.alerts.api.services.ActionListener;
@@ -81,6 +83,19 @@ public void process(Action action) {
         } catch (Exception e) {
             log.debug(e.getMessage(), e);
             msgLogger.errorProcessingAction(e.getMessage());
+        } finally {
+            if (pcc != null) {
+                try {
+                    pcc.close();
+                    pcc = null;
+                } catch (IOException ignored) { }
+            }
+            if (ccf != null) {
+                try {
+                    ccf.close();
+                    ccf = null;
+                } catch (JMSException ignored) { }
+            }
         }
     }
 
@@ -90,7 +105,11 @@ private void init() throws Exception {
         }
         if (conFactory == null) {
             conFactory = (TopicConnectionFactory) ctx.lookup(CONNECTION_FACTORY);
+        }
+        if (ccf == null) {
             ccf = new ConnectionContextFactory(conFactory);
+        }
+        if (pcc == null) {
             pcc = ccf.createProducerConnectionContext(new Endpoint(Endpoint.Type.TOPIC, ACTIONS_TOPIC));
         }
         if (definitions == null) {

diff --git a/...ar-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java b/...ar-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DroolsRulesEngineImpl.java
@@ -144,6 +144,14 @@ public void fire() {
 
             batchData.clear();
 
+            if (log.isTraceEnabled()) {
+                log.trace("Drools session dumping before firing: ");
+                for (FactHandle fact : kSession.getFactHandles()) {
+                    Object o = kSession.getObject(fact);
+                    log.trace("Fact: " + o.toString());
+                }
+            }
+
             kSession.fireAllRules();
         }
     }