diff options
| -rw-r--r-- | kvmd/aiotools.py | 2 | ||||
| -rw-r--r-- | kvmd/apps/kvmd/server.py | 2 | ||||
| -rw-r--r-- | kvmd/apps/kvmd/streamer.py | 2 | ||||
| -rw-r--r-- | kvmd/plugins/auth/http.py | 4 | ||||
| -rw-r--r-- | kvmd/plugins/msd/otg/__init__.py | 10 | ||||
| -rw-r--r-- | kvmd/plugins/msd/relay.py | 4 |
6 files changed, 0 insertions, 24 deletions
diff --git a/kvmd/aiotools.py b/kvmd/aiotools.py index 10510b77..a2bed6bf 100644 --- a/kvmd/aiotools.py +++ b/kvmd/aiotools.py @@ -178,8 +178,6 @@ async def run_region_task( async with region: entered.set_result(None) await method(*args, **kwargs) - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except region.get_exc_type(): raise except Exception: diff --git a/kvmd/apps/kvmd/server.py b/kvmd/apps/kvmd/server.py index 2d70d4b6..a965757c 100644 --- a/kvmd/apps/kvmd/server.py +++ b/kvmd/apps/kvmd/server.py @@ -397,8 +397,6 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins remote: Optional[str] = (ws._req.remote if ws._req is not None else None) # pylint: disable=protected-access get_logger().info("Removed client socket: remote=%s; id=%d; active=%d", remote, id(ws), len(self.__sockets)) await ws.close() - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: pass await self.__streamer_notifier.notify() diff --git a/kvmd/apps/kvmd/streamer.py b/kvmd/apps/kvmd/streamer.py index fec05987..f5bd6b1f 100644 --- a/kvmd/apps/kvmd/streamer.py +++ b/kvmd/apps/kvmd/streamer.py @@ -187,8 +187,6 @@ class Streamer: # pylint: disable=too-many-instance-attributes state = (await response.json())["result"] except (aiohttp.ClientConnectionError, aiohttp.ServerConnectionError): pass - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: get_logger().exception("Invalid streamer response from /state") return { diff --git a/kvmd/plugins/auth/http.py b/kvmd/plugins/auth/http.py index a79e327d..7e8d6c1e 100644 --- a/kvmd/plugins/auth/http.py +++ b/kvmd/plugins/auth/http.py @@ -20,8 +20,6 @@ # ========================================================================== # -import asyncio - from typing import Dict from typing import Optional @@ -92,8 +90,6 @@ class Plugin(BaseAuthService): response.raise_for_status() assert response.status == 200 return True - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: get_logger().exception("Failed HTTP auth request for user %r", user) return False diff --git a/kvmd/plugins/msd/otg/__init__.py b/kvmd/plugins/msd/otg/__init__.py index 97a49dc0..377c1c73 100644 --- a/kvmd/plugins/msd/otg/__init__.py +++ b/kvmd/plugins/msd/otg/__init__.py @@ -237,8 +237,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes self.__drive.set_image_path("") self.__drive.set_rw_flag(False) self.__drive.set_cdrom_flag(False) - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: get_logger(0).exception("Can't reset MSD") @@ -332,8 +330,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes await self.__close_new_file() try: await self.__remount_storage(rw=False) - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: pass finally: @@ -383,8 +379,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes if self.__new_file: get_logger().info("Closing new image file ...") await self.__new_file.close() - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: get_logger().exception("Can't close device file") finally: @@ -429,8 +423,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes if need_reload_state: await self.__reload_state() await self.__state_notifier.notify() - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: logger.exception("Unexpected MSD watcher error") @@ -451,8 +443,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes await self.__remount_storage(rw=False) storage_state = self.__get_storage_state() - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: logger.exception("Error while reloading MSD state; switching to offline") self.__state.storage = None diff --git a/kvmd/plugins/msd/relay.py b/kvmd/plugins/msd/relay.py index 34899f42..09a8710e 100644 --- a/kvmd/plugins/msd/relay.py +++ b/kvmd/plugins/msd/relay.py @@ -359,8 +359,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes if self.__device_file: get_logger().info("Closing device file ...") await self.__device_file.close() - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: get_logger().exception("Can't close device file") finally: @@ -374,8 +372,6 @@ class Plugin(BaseMsd): # pylint: disable=too-many-instance-attributes try: self.__device_info = await aiotools.run_async(_explore_device, self.__device_path) break - except asyncio.CancelledError: # pylint: disable=try-except-raise - raise except Exception: if retries == 0: self.__device_info = None |