Merge pull request #437 from home-assistant/fix_restart

Abstract restart logic

hassio/api/__init__.py

@@ -80,10 +80,10 @@ class RestAPI(CoreSysAttributes):
             web.get('/supervisor/ping', api_supervisor.ping),
             web.get('/supervisor/info', api_supervisor.info),
             web.get('/supervisor/stats', api_supervisor.stats),
+            web.get('/supervisor/logs', api_supervisor.logs),
             web.post('/supervisor/update', api_supervisor.update),
             web.post('/supervisor/reload', api_supervisor.reload),
             web.post('/supervisor/options', api_supervisor.options),
-
         ])
 
     def _register_homeassistant(self):

hassio/docker/interface.py

@@ -264,31 +264,6 @@ class DockerInterface(CoreSysAttributes):
         except docker.errors.DockerException as err:
             _LOGGER.warning("Can't grap logs from %s: %s", self.image, err)
 
-    @process_lock
-    def restart(self):
-        """Restart docker container."""
-        return self._loop.run_in_executor(None, self._restart)
-
-    def _restart(self):
-        """Restart docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self._docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        _LOGGER.info("Restart %s", self.image)
-
-        try:
-            container.restart(timeout=self.timeout)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't restart %s: %s", self.image, err)
-            return False
-
-        return True
-
     @process_lock
     def cleanup(self):
         """Check if old version exists and cleanup."""

hassio/homeassistant.py

@@ -216,17 +216,19 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
 
     async def _start(self):
         """Start HomeAssistant docker & wait."""
-        if await self.instance.run():
-            await self._block_till_run()
-
-    @process_lock
-    async def start(self):
-        """Run HomeAssistant docker."""
         if not await self.instance.run():
             return False
-
         return await self._block_till_run()
 
+    @process_lock
+    def start(self):
+        """Run HomeAssistant docker.
+
+        Return a coroutine.
+        """
+        return self._start()
+
+    @process_lock
     def stop(self):
         """Stop HomeAssistant docker.
 
@@ -237,10 +239,8 @@ class HomeAssistant(JsonConfig, CoreSysAttributes):
     @process_lock
     async def restart(self):
         """Restart HomeAssistant docker."""
-        if not await self.instance.restart():
-            return False
-
-        return await self._block_till_run()
+        await self.instance.stop()
+        return await self._start()
 
     def logs(self):
         """Get HomeAssistant docker logs.