graceful shutdown, kind of (still a need to handle SIGTERM in ToxManager)

toxmpp/data/toxmpp.py

@@ -416,7 +416,14 @@ class ToXMPPComponent(ComponentXMPP):
         #self.backend.unsub_from(presence['from'])
         
         # debug
-        tdbg('roster\n%s\n' % self.roster);
+        tdbg('roster\n%s\n' % self.roster)
+        
+        
+    # teardown/graceful shutdown
+    def __del__(self):
+        tdbg('tearing down...')
+        self.toxmanager.terminate()
+        self.toxmanager.join()
 
 
 if __name__ == '__main__':
@@ -487,6 +494,7 @@ if __name__ == '__main__':
         except KeyboardInterrupt:
             # cleanup
             tdbg('KeyboardInterrupt caught, exiting...')
+            xmpp.disconnect(wait=True)
             del xmpp
             sys.exit(0)
     else: