Merge pull request #1018 from forslund/bugfix/issue-1014

Bugfix/issue 1014
MycroftAI · Aug 31, 2017 · 995d67e · 995d67e
2 parents 2dc6e47 + 34a527b
commit 995d67e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/mycroft/skills/core.py b/mycroft/skills/core.py
@@ -256,7 +256,7 @@ def __register_stop(self):
         self.stop_time = time.time()
         self.stop_threshold = self.config_core.get("skills").get(
             'stop_threshold')
-        self.emitter.on('mycroft.stop', self.__handle_stop)
+        self.add_event('mycroft.stop', self.__handle_stop, False)
 
     def detach(self):
         for (name, intent) in self.registered_intents:
@@ -308,7 +308,7 @@ def _register_decorated(self):
         _intent_list = []
         _intent_file_list = []
 
-    def add_event(self, name, handler, need_self):
+    def add_event(self, name, handler, need_self=False):
         """
             Create event handler for executing intent
 
@@ -521,6 +521,7 @@ def shutdown(self):
         # removing events
         for e, f in self.events:
             self.emitter.remove(e, f)
+        self.events = None  # Remove reference to wrappers
 
         self.emitter.emit(
             Message("detach_skill", {"skill_id": str(self.skill_id) + ":"}))

diff --git a/mycroft/skills/main.py b/mycroft/skills/main.py
@@ -240,6 +240,14 @@ def _watch_skills():
                     logger.debug("Reloading Skill: " + skill_folder)
                     # removing listeners and stopping threads
                     skill["instance"].shutdown()
+
+                    # - 2 since there are two local references that are known
+                    refs = sys.getrefcount(skill["instance"]) - 2
+                    if refs > 0:
+                        logger.warn("After shutdown of {} there are still "
+                                    "{} references remaining. The skill "
+                                    "won't be cleaned from memory."
+                                    .format(skill['instance'].name, refs))
                     del skill["instance"]
                 skill["loaded"] = True
                 skill["instance"] = load_skill(

diff --git a/mycroft/skills/scheduled_skills.py b/mycroft/skills/scheduled_skills.py
@@ -116,7 +116,11 @@ def notify(self, timestamp):
 
     def shutdown(self):
         super(ScheduledSkill, self).shutdown()
+        # if timer method is running wait for it to complete
         self.cancel()
+        if self.timer and self.timer.isAlive():
+            self.timer.join()
+        self.timer = None
 
 
 class ScheduledCRUDSkill(ScheduledSkill):