Properly handle IRC Authentication failures

gkrizek · Jan 27, 2019 · 794a6fe · 794a6fe
1 parent cc2708f
commit 794a6fe
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ghi/irc.py b/ghi/irc.py
@@ -59,8 +59,11 @@ def waitAndSee(self, search):
             if tries > 20:
                 raise ConnectionError("Unable to connect to IRC: %s" % text) 
             ack = re.search(search, text, re.MULTILINE)
+            saslFailure = re.search(r'(.*)SASL authentication failed(.*)', text, re.MULTILINE)
             if ack:
                 return
+            elif saslFailure:
+                raise ConnectionError("Unable to connect to IRC: SASL Authentication Failure") 
             sleep(0.25)
             tries += 1
 
@@ -137,6 +140,8 @@ def sendMessages(pool, messages):
                 raise ConnectionError(text)
             sleep(0.25)
 
+        logging.info("Connection Successful")
+
         for channel in pool.channels:
             for message in messages:
                 irc.sendMessage(channel, message)