Support simpler broker and database connections

ligmos/utils/amq.py

@@ -275,6 +275,34 @@ def setupAMQBroker(cblk, topics, listener=None):
     return conn, listener
 
 
+def checkSingleConnection(broker, subscribe=True):
+    """
+    This is intended to be inside of some loop structure.
+    It's primarily used for checking whether the connection to the ActiveMQ
+    broker is still valid, and, if it was killed (set to None) because the
+    heartbeat failed, attempt to both reconnect and resubscribe to the
+    topics.
+    """
+    connChecking = broker[0]
+    thisListener = broker[1]
+
+    if connChecking.conn is None:
+        print("No connection at all! Retrying...")
+        # The topics were already stuffed into the connChecking object,
+        #   but it's nice to remember that we're subscribing to them
+        connChecking.connect(listener=thisListener, subscribe=subscribe)
+    elif connChecking.conn.transport.connected is False:
+        print("Connection died! Reestablishing...")
+        connChecking.connect(listener=thisListener, subscribe=subscribe)
+    else:
+        print("Connection still valid")
+
+    # Make sure we save any connection changes and give it back
+    broker = [connChecking, thisListener]
+
+    return broker
+
+
 def checkConnections(amqbrokers, subscribe=True):
     """
     This is intended to be inside of some loop structure.

ligmos/workers/connSetup.py

@@ -17,10 +17,35 @@
 from ..utils import database
 
 
+def connAMQ_simple(comm, topics, listener=None):
+    """
+    Set up the actual connections, which we'll then give back to the actual
+    objects for them to do stuff with afterwards.
+    """
+    # Now check the properties of this object to see if it's something we
+    #   actually regconize and then connect to
+    if comm.type.lower().startswith('activemq'):
+        # We get brokerlistener back as a return just in case it was
+        #   None initially, in which case amq.setupBroker would give one
+        conn, amqlistener = amq.setupAMQBroker(comm, topics, listener=listener)
+
+        # Store this so we can check/use it later
+        bkr = [conn, amqlistener]
+    else:
+        # No other types are defined yet
+        bkr = None
+
+    return bkr
+
+
 def connAMQ(comm, amqtopics, amqlistener=None):
     """
     Set up the actual connections, which we'll then give back to the actual
     objects for them to do stuff with afterwards.
+
+    Assumes that you're subscribing to many topics specified in
+    different configuration sections in comm; if that's not the case, use
+    connAMQ_simple() instead!
     """
     amqbrokers = {}