From d4968d478edcbc89f508207fa10184a08b207d18 Mon Sep 17 00:00:00 2001
From: Luke Rogers <lukeroge@gmail.com>
Date: Fri, 4 Oct 2013 10:56:26 +1300
Subject: [PATCH] stuff

---
 cloudbot.py    | 21 +++++++++------------
 core/irc.py    |  3 +--
 core/loader.py |  6 +++---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/cloudbot.py b/cloudbot.py
index 53ced0f..f64b81c 100644
--- a/cloudbot.py
+++ b/cloudbot.py
@@ -8,7 +8,6 @@ import signal
 # check python version 
 if sys.version_info < (2, 7, 0):
     print "CloudBot requires Python 2.7 or newer."
-    sys.stderr.write(os.linesep)
     sys.exit(1)
 
 # set up enviroment
@@ -27,15 +26,13 @@ def exit_gracefully(signum, frame):
 original_sigint = signal.getsignal(signal.SIGINT)
 signal.signal(signal.SIGINT, exit_gracefully)
 
-# little restart loop
-while True:
-    # create new bot object
-    cloudbot = bot.Bot()
+# create new bot object
+cloudbot = bot.Bot()
 
-    cloudbot.run()
-    if cloudbot.do_restart:
-        # this kills the bot
-        # TODO: make it not just kill the bot
-        sys.exit()
-    else:
-        sys.exit()
+cloudbot.run()
+if cloudbot.do_restart:
+    # this kills the bot
+    # TODO: make it not just kill the bot
+    sys.exit()
+else:
+    sys.exit()
diff --git a/core/irc.py b/core/irc.py
index 0f9234f..d39900c 100755
--- a/core/irc.py
+++ b/core/irc.py
@@ -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):
diff --git a/core/loader.py b/core/loader.py
index 0fc0c61..346ad73 100644
--- a/core/loader.py
+++ b/core/loader.py
@@ -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