Merge pull request #1534 from HumorBaby/1478-fix-broken-interrupt-han…

…dling-6.6.x

core: fix broken interrupt handling (6.6.x)

sopel/__init__.py

@@ -71,7 +71,12 @@ def signal_handler(sig, frame):
         if sig == signal.SIGUSR1 or sig == signal.SIGTERM or sig == signal.SIGINT:
             stderr('Got quit signal, shutting down.')
             p.quit('Closing')
+
+    # Define empty variable `p` for bot
+    p = None
     while True:
+        if p and p.hasquit:  # Check if `hasquit` was set for bot during disconnected phase
+            break
         try:
             p = bot.Sopel(config, daemon=daemon)
             if hasattr(signal, 'SIGUSR1'):

sopel/irc.py

@@ -189,7 +189,8 @@ def initiate_connect(self, host, port):
 
     def quit(self, message):
         """Disconnect from IRC and close the bot."""
-        self.write(['QUIT'], message)
+        if self.connected:  # Only send QUIT message if socket is open
+            self.write(['QUIT'], message)
         self.hasquit = True
         # Wait for acknowledgement from the server. By RFC 2812 it should be
         # an ERROR msg, but many servers just close the connection. Either way