Merge pull request #19 from fedora-infra/feature/careful-with-the-irc…

…-reconnects

Only reconnect to IRC if not shutting down.

fmn/consumer/backends/base.py

@@ -3,6 +3,8 @@
 
 
 class BaseBackend(object):
+    die = False
+
     def __init__(self, config, session, **kwargs):
         self.config = config
         self.session = session
@@ -37,3 +39,6 @@ def enable(self, detail_value):
 
     def disable(self, detail_value):
         self.preference_for(detail_value).set_enabled(self.session, False)
+
+    def stop(self):
+        self.die = True

fmn/consumer/backends/irc.py

@@ -270,11 +270,21 @@ def __init__(self, parent):
         self.parent = parent
 
     def clientConnectionLost(self, connector, reason):
-        self.parent.log.warning("Lost connection %r, reconnecting." % reason)
         self.parent.cleanup_clients(factory=self)
+
+        if self.parent.die:
+            self.parent.log.warning("Lost IRC connection.  Shutting down.")
+            return
+
+        self.parent.log.warning("Lost connection %r, reconnecting." % reason)
         connector.connect()
 
     def clientConnectionFailed(self, connector, reason):
-        self.parent.log.error("Could not connect: %r, retry in 60s" % reason)
         self.parent.cleanup_clients(factory=self)
+
+        if self.parent.die:
+            self.parent.log.warning("Couldn't connect to IRC.  Shutting down.")
+            return
+
+        self.parent.log.error("Could not connect: %r, retry in 60s" % reason)
         reactor.callLater(60, connector.connect)

fmn/consumer/consumer.py

@@ -65,3 +65,9 @@ def consume(self, raw_msg):
                     log.debug("    Queueing msg for digest")
                     fmn.lib.models.QueuedMessage.enqueue(
                         self.session, user, context, msg)
+
+    def stop(self):
+        log.info("Cleaning up FMNConsumer.")
+        for context, backend in self.backends.iteritems():
+            backend.stop()
+        super(FMNConsumer, self).stop()