Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-30 06:49:24 +01:00
Code Issues Projects Releases Wiki Activity

plugins/Owner: Fix the bug where plugins couldn't be loaded until after the first network was connected to.

Browse Source
This commit is contained in:
James Vega 2005-09-01 22:18:30 +00:00
parent 86a69b8f8e
commit f926f1d5c2
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/Owner/plugin.py
View File

@ -132,18 +132,11 @@ class Owner(callbacks.Plugin):
self.log = LogProxy(self.log) self.log = LogProxy(self.log)
# Setup command flood detection. # Setup command flood detection.
self.commands = ircutils.FloodQueue(60) self.commands = ircutils.FloodQueue(60)
# Setup Irc objects, connected to networks. If world.ircs is already
# populated, chances are that we're being reloaded, so don't do this.
if not world.ircs:
for network in conf.supybot.networks():
try:
self._connect(network)
except socket.error, e:
self.log.error('Could not connect to %s: %s.', network, e)
except Exception, e:
self.log.exception('Exception connecting to %s:', network)
self.log.error('Could not connect to %s: %s.', network, e)
# Setup plugins and default plugins for commands. # Setup plugins and default plugins for commands.
#
# This needs to be done before we connect to any networks so that the
# children of supybot.plugins (the actual plugins) exist and can be
# loaded.
for (name, s) in registry._cache.iteritems(): for (name, s) in registry._cache.iteritems():
if 'alwaysLoadDefault' in name or 'alwaysLoadImportant' in name: if 'alwaysLoadDefault' in name or 'alwaysLoadImportant' in name:
continue continue
@ -164,6 +157,17 @@ class Owner(callbacks.Plugin):
except ValueError: # unpack list of wrong size. except ValueError: # unpack list of wrong size.
continue continue
registerDefaultPlugin(name, s) registerDefaultPlugin(name, s)
# Setup Irc objects, connected to networks. If world.ircs is already
# populated, chances are that we're being reloaded, so don't do this.
if not world.ircs:
for network in conf.supybot.networks():
try:
self._connect(network)
except socket.error, e:
self.log.error('Could not connect to %s: %s.', network, e)
except Exception, e:
self.log.exception('Exception connecting to %s:', network)
self.log.error('Could not connect to %s: %s.', network, e)
def callPrecedence(self, irc): def callPrecedence(self, irc):
return ([], [cb for cb in irc.callbacks if cb is not self]) return ([], [cb for cb in irc.callbacks if cb is not self])