From 2bd4a88d76e329a9536c82867d908609368ada5f Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Mon, 1 Sep 2003 15:46:10 +0000
Subject: [PATCH] Made it reset the IRC object before reconnection, and made it
 catch connect errors.

---
 src/socketDrivers.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/socketDrivers.py b/src/socketDrivers.py
index 8c9c363ef..e34ce1050 100644
--- a/src/socketDrivers.py
+++ b/src/socketDrivers.py
@@ -96,11 +96,16 @@ class SocketDriver(drivers.IrcDriver):
         #debug.methodNamePrintf(self, 'reconnect')
         self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.conn.settimeout(conf.poll)
-        self.conn.connect(self.server)
+        try:
+            self.conn.connect(self.server)
+        except socket.error, e:
+            debug.msg('Error connecting to %s: %s' % (self.server, e))
+            self.die()
         self.connected = True
 
     def die(self):
         #debug.methodNamePrintf(self, 'die')
+        self.irc.reset()
         self.conn.close()
         self.connected = False
         schedule.addEvent(self.reconnect, time.time()+300)