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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2020-05-25 01:52:37 +03:00
parent d5dca5a8b4
commit e6f8396661
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kvmd/apps/ipmi/server.py
View File

@@ -128,7 +128,7 @@ class IpmiServer(BaseIpmiServer): # pylint: disable=too-many-instance-attribute
method = functools.reduce(getattr, method_path.split("."), kvmd_session) method = functools.reduce(getattr, method_path.split("."), kvmd_session)
return (await method(**kwargs)) return (await method(**kwargs))
except (aiohttp.ClientError, asyncio.TimeoutError) as err: except (aiohttp.ClientError, asyncio.TimeoutError) as err:
logger.error("Can't perform request %s: %s", name, str(err)) logger.error("Can't perform request %s: %s", name, err)
raise raise
return aiotools.run_sync(runner()) return aiotools.run_sync(runner())

2
kvmd/apps/kvmd/info.py
View File

@@ -99,5 +99,5 @@ class InfoManager:
return (enabled or (manager.GetUnitFileState(name) in ["enabled", "enabled-runtime", "static", "indirect", "generated"])) return (enabled or (manager.GetUnitFileState(name) in ["enabled", "enabled-runtime", "static", "indirect", "generated"]))
except Exception as err: except Exception as err:
get_logger(0).error("Can't get info about the service %r: %s: %s", name, type(err).__name__, str(err)) get_logger(0).error("Can't get info about the service %r: %s: %s", name, type(err).__name__, err)
return True return True

4
kvmd/apps/vnc/rfb/__init__.py
View File

@@ -106,9 +106,9 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute
logger.info("[%s] Client %s: Cancelling subtask ...", name, self._remote) logger.info("[%s] Client %s: Cancelling subtask ...", name, self._remote)
raise raise
except RfbConnectionError as err: except RfbConnectionError as err:
logger.info("[%s] Client %s: Gone: %s", name, self._remote, str(err)) logger.info("[%s] Client %s: Gone: %s", name, self._remote, err)
except (RfbError, ssl.SSLError) as err: except (RfbError, ssl.SSLError) as err:
logger.error("[%s] Client %s: Error: %s", name, self._remote, str(err)) logger.error("[%s] Client %s: Error: %s", name, self._remote, err)
except Exception: except Exception:
logger.exception("[%s] Unhandled exception with client %s", name, self._remote) logger.exception("[%s] Unhandled exception with client %s", name, self._remote)

2
kvmd/apps/vnc/server.py
View File

@@ -180,7 +180,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
else: else:
await self.__send_fb_stub("No signal") await self.__send_fb_stub("No signal")
except StreamerError as err: except StreamerError as err:
logger.info("[streamer] Client %s: Waiting for stream: %s", self._remote, str(err)) logger.info("[streamer] Client %s: Waiting for stream: %s", self._remote, err)
await self.__send_fb_stub("Waiting for stream ...") await self.__send_fb_stub("Waiting for stream ...")
await asyncio.sleep(1) await asyncio.sleep(1)

2
kvmd/validators/net.py
View File

@@ -85,5 +85,5 @@ def valid_ssl_ciphers(arg: Any) -> str:
try: try:
ssl.SSLContext().set_ciphers(arg) ssl.SSLContext().set_ciphers(arg)
except Exception as err: except Exception as err:
raise ValidatorError(f"The argument {arg!r} is not a valid {name}: {str(err)}") raise ValidatorError(f"The argument {arg!r} is not a valid {name}: {err}")
return arg return arg