MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename MycroftSkill.shutdown to MycroftSkill._shutdown 

This removes the need for skills to call Super(MySkill, self).shutdown()
pull/1519/head
Matthew D. Scholefield 2018-04-11 21:10:45 -05:00
parent 10bd9a1cf3
commit fa11ac7dbe
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mycroft/skills/container.py
View File

@ -88,7 +88,7 @@ class SkillContainer(object):
def stop(self): def stop(self):
if self.skill: if self.skill:
self.skill.shutdown() self.skill._shutdown()
def main(): def main():

9
mycroft/skills/core.py
View File

@ -882,6 +882,11 @@ class MycroftSkill(object):
process termination. The skill implementation must process termination. The skill implementation must
shutdown all processes and operations in execution. shutdown all processes and operations in execution.
""" """
pass
def _shutdown(self):
"""Parent function called internally to shut down everything"""
self.shutdown()
# Store settings # Store settings
self.settings.store() self.settings.store()
self.settings.is_alive = False self.settings.is_alive = False
@ -1154,9 +1159,9 @@ class FallbackSkill(MycroftSkill):
handler = self.instance_fallback_handlers.pop() handler = self.instance_fallback_handlers.pop()
self.remove_fallback(handler) self.remove_fallback(handler)
def shutdown(self): def _shutdown(self):
""" """
Remove all registered handlers and perform skill shutdown. Remove all registered handlers and perform skill shutdown.
""" """
self.remove_instance_handlers() self.remove_instance_handlers()
super(FallbackSkill, self).shutdown() super(FallbackSkill, self)._shutdown()

4
mycroft/skills/main.py
View File

@ -378,7 +378,7 @@ class SkillManager(Thread):
LOG.debug("Reloading Skill: " + skill_folder) LOG.debug("Reloading Skill: " + skill_folder)
# removing listeners and stopping threads # removing listeners and stopping threads
try: try:
skill["instance"].shutdown() skill["instance"]._shutdown()
except Exception: except Exception:
LOG.exception("An error occured while shutting down {}" LOG.exception("An error occured while shutting down {}"
.format(skill["instance"].name)) .format(skill["instance"].name))
@ -503,7 +503,7 @@ class SkillManager(Thread):
instance = skill_info.get('instance') instance = skill_info.get('instance')
if instance: if instance:
try: try:
instance.shutdown() instance._shutdown()
except Exception: except Exception:
LOG.exception('Shutting down skill: ' + name) LOG.exception('Shutting down skill: ' + name)

2
test/integrationtests/skills/skill_tester.py
View File

@ -61,7 +61,7 @@ def load_skills(emitter, skills_root):
def unload_skills(skills): def unload_skills(skills):
for s in skills: for s in skills:
s.shutdown() s._shutdown()
class RegistrationOnlyEmitter(object): class RegistrationOnlyEmitter(object):