testing a small fix

core/main.py

@@ -30,7 +30,7 @@ def irc_watcher(f_conn):
         except:
             traceback.print_exc()
         time.sleep(5) # sleep a bit before restarting watcher
-        print "restarting watcher component..."
+        print "watcher has stopped; restarting component..."
 
 def run():
     global f_conn
@@ -42,9 +42,8 @@ def run():
 
     frontend.main(f_conn)
 
+    w_conn.close()
+    f_conn.close()
+
 if __name__ == "__main__":
-    try:
-        run()
-    finally:
-        f_conn.close()
-        w_conn.close()
+    run()

irc/watcher.py

@@ -21,10 +21,9 @@ def main(connection, f_conn):
     read_buffer = str()
 
     while 1:
-        try:        
+        try:
             read_buffer = read_buffer + connection.get()
         except RuntimeError: # socket broke
-            print "socket has broken on watcher, restarting component..."
             return
 
         lines = read_buffer.split("\n")