GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

using shield_fg()

Browse Source
This commit is contained in:
Maxim Devaev
2022-08-07 19:18:23 +03:00
parent 1d4b39ef1b
commit fdc3edfa79
7 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,12 +354,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
yield self.__reader
finally:
# FIXME: Перехват важен потому что по какой-то причине await
# во вложенных finally путаются и выполняются не по порядку
try:
await asyncio.shield(self.__close_reader())
except asyncio.CancelledError:
pass
await aiotools.shield_fg(self.__close_reader())
finally:
self.__notifier.notify()
@@ -404,20 +399,13 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
except Exception:
pass
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
await aiotools.shield_fg(self.__close_writer())
finally:
await aiotools.shield_fg(self.__remount_rw(False, fatal=False))
finally:
# Между закрытием файла и эвентом айнотифи состояние может быть не обновлено,
# так что форсим обновление вручную, чтобы получить актуальное состояние.
try:
await asyncio.shield(self.__reload_state())
except asyncio.CancelledError:
pass
await aiotools.shield_fg(self.__reload_state())
@aiotools.atomic
async def remove(self, name: str) -> None:

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

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