jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-21 08:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

More log output (#214)

Browse Source 
* Update snapshot.py

* Update __init__.py

* Update snapshot.py

* Update snapshot.py

* fix lint
This commit is contained in:
Pascal Vizeli 2017-10-09 13:30:15 +02:00 committed by GitHub
parent 68566ee9e1
commit 2df4f80aa5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hassio/snapshots/__init__.py
View File

@ -197,6 +197,8 @@ class SnapshotsManager(object):
await snapshot.restore_folders() await snapshot.restore_folders()
# start homeassistant restore # start homeassistant restore
_LOGGER.info("Full-Restore %s restore Home-Assistant",
snapshot.slug)
snapshot.restore_homeassistant(self.homeassistant) snapshot.restore_homeassistant(self.homeassistant)
task_hass = self.loop.create_task( task_hass = self.loop.create_task(
self.homeassistant.update(snapshot.homeassistant_version)) self.homeassistant.update(snapshot.homeassistant_version))
@ -279,6 +281,8 @@ class SnapshotsManager(object):
await snapshot.restore_folders(folders) await snapshot.restore_folders(folders)
if homeassistant: if homeassistant:
_LOGGER.info("Partial-Restore %s restore Home-Assistant",
snapshot.slug)
snapshot.restore_homeassistant(self.homeassistant) snapshot.restore_homeassistant(self.homeassistant)
tasks.append(self.homeassistant.update( tasks.append(self.homeassistant.update(
snapshot.homeassistant_version)) snapshot.homeassistant_version))

8
hassio/snapshots/snapshot.py
View File

@ -261,7 +261,8 @@ class Snapshot(object):
"""Async context to close a snapshot.""" """Async context to close a snapshot."""
# exists snapshot or exception on build # exists snapshot or exception on build
if self.tar_file.is_file() or exception_type is not None: if self.tar_file.is_file() or exception_type is not None:
return self._tmp.cleanup() self._tmp.cleanup()
return
# validate data # validate data
try: try:
@ -283,7 +284,6 @@ class Snapshot(object):
_LOGGER.error("Can't write snapshot.json") _LOGGER.error("Can't write snapshot.json")
self._tmp.cleanup() self._tmp.cleanup()
self._tmp = None
async def import_addon(self, addon): async def import_addon(self, addon):
"""Add a addon into snapshot.""" """Add a addon into snapshot."""
@ -323,9 +323,11 @@ class Snapshot(object):
origin_dir = Path(self.config.path_hassio, name) origin_dir = Path(self.config.path_hassio, name)
try: try:
_LOGGER.info("Snapshot folder %s", name)
with tarfile.open(snapshot_tar, "w:gz", with tarfile.open(snapshot_tar, "w:gz",
compresslevel=1) as tar_file: compresslevel=1) as tar_file:
tar_file.add(origin_dir, arcname=".") tar_file.add(origin_dir, arcname=".")
_LOGGER.info("Snapshot folder %s done", name)
self._data[ATTR_FOLDERS].append(name) self._data[ATTR_FOLDERS].append(name)
except tarfile.TarError as err: except tarfile.TarError as err:
@ -352,8 +354,10 @@ class Snapshot(object):
remove_folder(origin_dir) remove_folder(origin_dir)
try: try:
_LOGGER.info("Restore folder %s", name)
with tarfile.open(snapshot_tar, "r:gz") as tar_file: with tarfile.open(snapshot_tar, "r:gz") as tar_file:
tar_file.extractall(path=origin_dir) tar_file.extractall(path=origin_dir)
_LOGGER.info("Restore folder %s done", name)
except tarfile.TarError as err: except tarfile.TarError as err:
_LOGGER.warning("Can't restore folder %s -> %s", name, err) _LOGGER.warning("Can't restore folder %s -> %s", name, err)