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() in atomic (now atomic_fg)

Browse Source
This commit is contained in:
Maxim Devaev
2022-08-07 19:35:08 +03:00
parent fdc3edfa79
commit e37a7254d5
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
async def systask(self) -> None:
await self.__watch_inotify()
@aiotools.atomic
@aiotools.atomic_fg
async def reset(self) -> None:
async with self.__state.busy(check_online=False):
try:
@@ -257,14 +257,14 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
except Exception:
get_logger(0).exception("Can't reset MSD properly")
@aiotools.atomic
@aiotools.atomic_fg
async def cleanup(self) -> None:
await self.__close_reader()
await self.__close_writer()
# =====
@aiotools.atomic
@aiotools.atomic_fg
async def set_params(
self,
name: Optional[str]=None,
@@ -299,7 +299,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if rw:
self.__state.vd.cdrom = False
@aiotools.atomic
@aiotools.atomic_fg
async def set_connected(self, connected: bool) -> None:
async with self.__state.busy():
assert self.__state.vd
@@ -407,7 +407,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
# так что форсим обновление вручную, чтобы получить актуальное состояние.
await aiotools.shield_fg(self.__reload_state())
@aiotools.atomic
@aiotools.atomic_fg
async def remove(self, name: str) -> None:
async with self.__state.busy():
assert self.__state.storage

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

@@ -156,14 +156,14 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
prev_state = state
await self.__notifier.wait()
@aiotools.atomic
@aiotools.atomic_fg
async def reset(self) -> None:
await aiotools.run_region_task(
"Can't reset MSD or operation was not completed",
self.__region, self.__inner_reset,
)
@aiotools.atomic
@aiotools.atomic_fg
async def __inner_reset(self) -> None:
await self.__gpio.reset()
self.__gpio.switch_to_local()
@@ -171,7 +171,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
await self.__load_device_info()
get_logger(0).info("MSD reset has been successful")
@aiotools.atomic
@aiotools.atomic_fg
async def cleanup(self) -> None:
try:
await self.__close_device_writer()
@@ -180,7 +180,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
# =====
@aiotools.atomic
@aiotools.atomic_fg
async def set_params(
self,
name: Optional[str]=None,
@@ -196,7 +196,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
if rw is not None:
raise MsdRwNotSupported()
@aiotools.atomic
@aiotools.atomic_fg
async def set_connected(self, connected: bool) -> None:
async with self.__working():
async with self.__region:
@@ -254,7 +254,7 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes
finally:
await aiotools.shield_fg(self.__load_device_info())
@aiotools.atomic
@aiotools.atomic_fg
async def remove(self, name: str) -> None:
async with self.__working():
raise MsdMultiNotSupported()