GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

shield some finally ops

Browse Source
This commit is contained in:
Maxim Devaev 2022-08-05 15:07:17 +03:00
parent 9ee63aba3e
commit eeaeebf7c7
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kvmd/plugins/msd/otg/__init__.py
View File

@ -354,9 +354,17 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
yield self.__reader
finally:
await self.__close_reader()
# FIXME: Перехват важен потому что по какой-то причине await
# во вложенных finally путаются и выполняются не по порядку
try:
await asyncio.shield(self.__close_reader())
except asyncio.CancelledError:
pass
finally:
await self.__notifier.notify()
try:
await asyncio.shield(self.__notifier.notify())
except asyncio.CancelledError:
pass
@contextlib.asynccontextmanager
async def write_image(self, name: str, size: int, remove_incomplete: Optional[bool]) -> AsyncGenerator[MsdFileWriter, None]:
@ -398,13 +406,25 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
os.remove(path)
except Exception:
pass
await self.__close_writer()
await self.__remount_rw(False, fatal=False)
try:
await asyncio.shield(self.__close_writer())
except asyncio.CancelledError:
pass
try:
await asyncio.shield(self.__remount_rw(False, fatal=False))
except asyncio.CancelledError:
pass
finally:
# Между закрытием файла и эвентом айнотифи состояние может быть не обновлено,
# так что форсим обновление вручную, чтобы получить актуальное состояние.
await self.__reload_state()
await self.__notifier.notify()
try:
await asyncio.shield(self.__reload_state())
except asyncio.CancelledError:
pass
try:
await asyncio.shield(self.__notifier.notify())
except asyncio.CancelledError:
pass
@aiotools.atomic
async def remove(self, name: str) -> None:

10
kvmd/plugins/msd/relay/__init__.py
View File

@ -249,8 +249,14 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
yield self.__device_writer
await self.__write_image_info(True)
finally:
await self.__close_device_writer()
await self.__load_device_info()
try:
await asyncio.shield(self.__close_device_writer())
except asyncio.CancelledError:
pass
try:
await asyncio.shield(self.__load_device_info())
except asyncio.CancelledError:
pass
@aiotools.atomic
async def remove(self, name: str) -> None: