eryn/ubot2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed regression, now self.debug exists in Plugin class context

Browse source
This commit is contained in:
Thomas Zakrajsek 2015-08-02 19:08:29 -04:00
parent 08f9feacf6
commit bfe7df401a
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rtmbot/core.py
View file

@ -110,7 +110,8 @@ class RtmBot(object):
# try: # try:
if name in self.config: if name in self.config:
logging.info("config found for: " + name) logging.info("config found for: " + name)
plugin_config = self.config.get(name) plugin_config = self.config.get(name, {})
plugin_config['DEBUG'] = self.debug
self.bot_plugins.append(Plugin(name, plugin_config)) self.bot_plugins.append(Plugin(name, plugin_config))
# except: # except:
# print "error loading plugin %s" % name # print "error loading plugin %s" % name
@ -121,6 +122,7 @@ class Plugin(object):
self.jobs = [] self.jobs = []
self.module = __import__(name) self.module = __import__(name)
self.module.config = plugin_config self.module.config = plugin_config
self.debug = self.module.config.get('DEBUG')
self.register_jobs() self.register_jobs()
self.outputs = [] self.outputs = []
if 'setup' in dir(self.module): if 'setup' in dir(self.module):
@ -138,7 +140,7 @@ class Plugin(object):
def do(self, function_name, data): def do(self, function_name, data):
if function_name in dir(self.module): if function_name in dir(self.module):
#this makes the plugin fail with stack trace in debug mode #this makes the plugin fail with stack trace in debug mode
if not debug: if not self.debug:
try: try:
eval("self.module."+function_name)(data) eval("self.module."+function_name)(data)
except: except: