new approach for IRC reconnect: replace the bot object itself!

Author: bspkrs

Diff for: BotBase.py

@@ -10,7 +10,7 @@
 import os
 import shutil
 import time
-from IRCHandler import CmdHandler,CmdGenerator,Sender,Color, EOL
+from IRCHandler import CmdHandler, CmdGenerator, Sender, Color, EOL
 from ConfigHandler import AdvConfigParser
 
 
@@ -48,7 +48,7 @@ def run(self):
             last_start = time.time()
 
             if not self.bot.isRunning:
-                self.bot.resetSockets()
+                self.bot = self.bot.clone()
                 self.start()
 
             try:
@@ -80,6 +80,7 @@ def run(self):
 class BotBase(object):
     def __init__(self, configfile=None, nspass=None, backupcfg=False):
         self.configfile = configfile if configfile else 'bot.cfg'
+        self.backupcfg = backupcfg
 
         if backupcfg and os.path.exists(self.configfile):
             backupcfgname = self.configfile + '.' + datetime.datetime.now().strftime('%Y%m%d%H%M%S') + '.bak'
@@ -163,7 +164,14 @@ def __init__(self, configfile=None, nspass=None, backupcfg=False):
         self.socket = None
         self.dccSocketv4 = None
         self.dccSocketv6 = None
-        self.resetSockets()
+        self.socket = AsyncSocket.AsyncSocket(self, self.host, self.port, self.floodLimit)
+        self.dccSocketv4 = DCCSocket.DCCSocket(self, False)
+        if socket.has_ipv6:
+            try:
+                self.dccSocketv6 = DCCSocket.DCCSocket(self, True)
+            except socket.error, e:
+                if e.message.find('A socket operation was attempted to an unreachable network') != -1:
+                    self.dccSocketv6 = None
         self.cmdHandler = CmdHandler(self)
 
         self.registerCommand('dcc',  self.requestDCC, ['any'], 0, 0, "",            "Requests a DCC connection to the bot.")
@@ -191,15 +199,8 @@ def __init__(self, configfile=None, nspass=None, backupcfg=False):
         if self.about_msg and self.about_msg != '':
             self.registerCommand('about', self.aboutcmd, ['any'], 0, 0, '', 'About this bot.', allowpub=True)
 
-    def resetSockets(self):
-        self.socket = AsyncSocket.AsyncSocket(self, self.host, self.port, self.floodLimit)
-        self.dccSocketv4 = DCCSocket.DCCSocket(self, False)
-        if socket.has_ipv6:
-            try:
-                self.dccSocketv6 = DCCSocket.DCCSocket(self, True)
-            except socket.error, e:
-                if e.message.find('A socket operation was attempted to an unreachable network') != -1:
-                    self.dccSocketv6 = None
+    def clone(self):
+        return BotBase(self.configfile, self.nspass, self.backupcfg)
 
     def run(self):
         if self.host == "":

Diff for: MCPBot.py

@@ -11,7 +11,7 @@
 import zipfile, os, re
 import psycopg2.extras
 
-__version__ = "0.8.0"
+__version__ = "0.9.0"
 
 class MCPBot(BotBase):
     def __init__(self, configfile=None, nspass=None, backupcfg=False):
@@ -117,6 +117,8 @@ def __init__(self, configfile=None, nspass=None, backupcfg=False):
         self.legacyCommandMap = {'gcc': 'gc', 'gsc': 'gc', 'gcf': 'gf', 'gsf' : 'gf',  'gcm' : 'gm',  'gsm' : 'gm',  'scf' : 'sf',
                                  'ssf': 'sf', 'scm': 'sm', 'ssm': 'sm', 'fscf': 'fsf', 'fssf': 'fsf', 'fscm': 'fsm', 'fssm': 'fsm'}
 
+    def clone(self):
+        return MCPBot(self.configfile, self.nspass, self.backupcfg)
 
     def onStartUp(self):
         super(MCPBot, self).onStartUp()