summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorBrian Beggs <macdiesel@gmail.com>2010-06-02 08:45:42 -0400
committerBrian Beggs <macdiesel@gmail.com>2010-06-02 08:45:42 -0400
commitb0066f3ef4644c14f645f589fb36846f23f664ab (patch)
tree3436b1e7de2c24cf18b8223b092bda04a7b17d51 /sleekxmpp
parentc0457cf5d002212a3d9946c8df9879618baf830c (diff)
downloadslixmpp-b0066f3ef4644c14f645f589fb36846f23f664ab.tar.gz
slixmpp-b0066f3ef4644c14f645f589fb36846f23f664ab.tar.bz2
slixmpp-b0066f3ef4644c14f645f589fb36846f23f664ab.tar.xz
slixmpp-b0066f3ef4644c14f645f589fb36846f23f664ab.zip
added try/catch block to plugin loading
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/basexmpp.py27
1 files changed, 15 insertions, 12 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 5f330176..b78c255c 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -97,18 +97,21 @@ class basexmpp(object):
# discover relative "path" to the plugins module from the main app, and import it.
# TODO:
# gross, this probably isn't necessary anymore, especially for an installed module
- if pluginModule:
- module = __import__("%s.%s" % (pluginModule, plugin), globals(), locals(), [plugin])
- else:
- module = __import__("%s.%s" % (globals()['plugins'].__name__, plugin), globals(), locals(), [plugin])
- # init the plugin class
- self.plugin[plugin] = getattr(module, plugin)(self, pconfig) # eek
- # all of this for a nice debug? sure.
- xep = ''
- if hasattr(self.plugin[plugin], 'xep'):
- xep = "(XEP-%s) " % self.plugin[plugin].xep
- logging.debug("Loaded Plugin %s%s" % (xep, self.plugin[plugin].description))
-
+ try:
+ if pluginModule:
+ module = __import__(pluginModule, globals(), locals(), [plugin])
+ else:
+ module = __import__("%s.%s" % (globals()['plugins'].__name__, plugin), globals(), locals(), [plugin])
+ # init the plugin class
+ self.plugin[plugin] = getattr(module, plugin)(self, pconfig) # eek
+ # all of this for a nice debug? sure.
+ xep = ''
+ if hasattr(self.plugin[plugin], 'xep'):
+ xep = "(XEP-%s) " % self.plugin[plugin].xep
+ logging.debug("Loaded Plugin %s%s" % (xep, self.plugin[plugin].description))
+ except:
+ logging.error("Unable to load plugin: %s" %(plugin) )
+
def register_plugins(self):
"""Initiates all plugins in the plugins/__init__.__all__"""
if self.plugin_whitelist: