ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

stuff

Browse source
This commit is contained in:
Luke Rogers 2013-10-04 10:56:26 +13:00
parent c2271b1195
commit d4968d478e
3 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/irc.py
View file

@ -118,6 +118,7 @@ class ParseThread(threading.Thread):
self.output_queue = output_queue # lines to be sent out
self.parsed_queue = parsed_queue # lines that have been parsed
self.daemon = True
threading.Thread.__init__(self)
def run(self):
@ -171,11 +172,9 @@ class IRCConnection(object):
self.socket.connect((self.host, self.port))
self.receive_thread = ReceiveThread(self.socket, self.input_queue, self.timeout)
self.receive_thread.daemon = True
self.receive_thread.start()
self.send_thread = SendThread(self.socket, self.conn_name, self.output_queue)
self.send_thread.daemon = True
self.send_thread.start()
def stop(self):

6
core/loader.py
View file

@ -116,12 +116,12 @@ class PluginLoader(object):
for plugin in self.bot.plugins['command']:
name = plugin[1]['name'].lower()
if not re.match(r'^\w+$', name):
self.bot.logger.error('Invalid command name: "{}"" ({})'.format(name, format_plug(plugin)))
self.bot.logger.error('Invalid command name: "{}" ({})'.format(name, format_plug(plugin)))
continue
if name in self.bot.commands:
print "### ERROR: command '{}' already registered ({}, {})".format(name,
self.bot.logger.error('Command already registered: "{}" ({}, {})'.format(name,
format_plug(self.bot.commands[name]),
format_plug(plugin))
format_plug(plugin)))
continue
self.bot.commands[name] = plugin