Merge pull request CloudBotIRC#127 from linuxdaemon/gonzobot+periodic-hook-fix

Properly cancel the periodic hooks

Author: edwardslabs

cloudbot/bot.py

@@ -130,6 +130,7 @@ def run(self):
         self.loop.run_until_complete(self._init_routine())
         # Wait till the bot stops. The stopped_future will be set to True to restart, False otherwise
         restart = self.loop.run_until_complete(self.stopped_future)
+        self.loop.run_until_complete(self.plugin_manager.unload_all())
         self.loop.close()
         return restart
 

cloudbot/plugin.py

@@ -112,6 +112,12 @@ def load_all(self, plugin_dir):
         # Load plugins asynchronously :O
         yield from asyncio.gather(*[self.load_plugin(path) for path in path_list], loop=self.bot.loop)
 
+    @asyncio.coroutine
+    def unload_all(self):
+        yield from asyncio.gather(
+            *[self.unload_plugin(path) for path in self.plugins.keys()], loop=self.bot.loop
+        )
+
     @asyncio.coroutine
     def load_plugin(self, path):
         """
@@ -173,10 +179,10 @@ def load_plugin(self, path):
         self.plugins[plugin.file_name] = plugin
 
         for periodic_hook in plugin.periodic:
-            asyncio.async(self._start_periodic(periodic_hook))
+            task = asyncio.async(self._start_periodic(periodic_hook))
+            plugin.tasks.append(task)
             self._log_hook(periodic_hook)
 
-
         # register commands
         for command_hook in plugin.commands:
             for alias in command_hook.aliases:
@@ -249,6 +255,9 @@ def unload_plugin(self, path):
         # get the loaded plugin
         plugin = self.plugins[file_name]
 
+        for task in plugin.tasks:
+            task.cancel()
+
         # unregister commands
         for command_hook in plugin.commands:
             for alias in command_hook.aliases:
@@ -502,6 +511,7 @@ def __init__(self, filepath, filename, title, code):
         :type filename: str
         :type code: object
         """
+        self.tasks = []
         self.file_path = filepath
         self.file_name = filename
         self.title = title