Merge pull request #2529 from forslund/feature/stop-sequence

Update skill stop sequence

mycroft/skills/audioservice.py

@@ -149,7 +149,7 @@ def track_info(self):
         info = self.bus.wait_for_response(
             Message('mycroft.audio.service.track_info'),
             reply_type='mycroft.audio.service.track_info_reply',
-            timeout=5)
+            timeout=1)
         return info.data if info else {}
 
     def available_backends(self):

mycroft/skills/skill_manager.py

@@ -16,7 +16,7 @@
 import os
 from glob import glob
 from threading import Thread, Event, Lock
-from time import sleep, time
+from time import sleep, time, monotonic
 
 from mycroft.api import is_paired
 from mycroft.enclosure.api import EnclosureAPI
@@ -51,6 +51,10 @@ def start(self):
         self.send()
         self.started = True
 
+    def stop(self):
+        """Stop the queue, and hinder any further transmissions."""
+        self.started = False
+
     def send(self):
         """Loop through all stored loaders triggering settingsmeta upload."""
         with self.lock:
@@ -59,7 +63,10 @@ def send(self):
         if queue:
             LOG.info('New Settings meta to upload.')
             for loader in queue:
-                loader.instance.settings_meta.upload()
+                if self.started:
+                    loader.instance.settings_meta.upload()
+                else:
+                    break
 
     def __len__(self):
         return len(self._queue)
@@ -77,6 +84,29 @@ def put(self, loader):
             self._queue.append(loader)
 
 
+def _shutdown_skill(instance):
+    """Shutdown a skill.
+
+    Call the default_shutdown method of the skill, will produce a warning if
+    the shutdown process takes longer than 1 second.
+
+    Arguments:
+        instance (MycroftSkill): Skill instance to shutdown
+    """
+    try:
+        ref_time = monotonic()
+        # Perform the shutdown
+        instance.default_shutdown()
+
+        shutdown_time = monotonic() - ref_time
+        if shutdown_time > 1:
+            LOG.warning('{} shutdown took {} seconds'.format(instance.skill_id,
+                                                             shutdown_time))
+    except Exception:
+        LOG.exception('Failed to shut down skill: '
+                      '{}'.format(instance.skill_id))
+
+
 class SkillManager(Thread):
     _msm = None
 
@@ -378,16 +408,12 @@ def stop(self):
         """Tell the manager to shutdown."""
         self._stop_event.set()
         self.settings_downloader.stop_downloading()
+        self.upload_queue.stop()
 
         # Do a clean shutdown of all skills
         for skill_loader in self.skill_loaders.values():
             if skill_loader.instance is not None:
-                try:
-                    skill_loader.instance.default_shutdown()
-                except Exception:
-                    LOG.exception(
-                        'Failed to shut down skill: ' + skill_loader.skill_id
-                    )
+                _shutdown_skill(skill_loader.instance)
 
     def handle_converse_request(self, message):
         """Check if the targeted skill id can handle conversation

stop-mycroft.sh

@@ -94,11 +94,11 @@ case ${OPT} in
         ;&
     "")
         echo "Stopping all mycroft-core services"
-        end-process messagebus.service
         end-process skills
         end-process audio
         end-process speech
         end-process enclosure
+        end-process messagebus.service
         ;;
     "bus")
         end-process messagebus.service