mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 09:01:54 +08:00
refactoring
This commit is contained in:
@@ -34,6 +34,7 @@ from ....logging import get_logger
|
||||
from ....yamlconf import Section
|
||||
from ....yamlconf.loader import load_yaml_file
|
||||
|
||||
from .... import tools
|
||||
from .... import aiotools
|
||||
|
||||
from .base import BaseInfoSubmanager
|
||||
@@ -98,5 +99,5 @@ class ExtrasInfoSubmanager(BaseInfoSubmanager):
|
||||
|
||||
return (enabled or (manager.GetUnitFileState(name) in ["enabled", "enabled-runtime", "static", "indirect", "generated"]))
|
||||
except Exception as err:
|
||||
get_logger(0).error("Can't get info about the service %r: %s: %s", name, type(err).__name__, err)
|
||||
get_logger(0).error("Can't get info about the service %r: %s", name, tools.efmt(err))
|
||||
return True
|
||||
|
||||
@@ -325,7 +325,7 @@ class Streamer: # pylint: disable=too-many-instance-attributes
|
||||
return snapshot
|
||||
logger.error("Stream is offline, no signal or so")
|
||||
except (aiohttp.ClientConnectionError, aiohttp.ServerConnectionError) as err:
|
||||
logger.error("Can't connect to streamer: %s: %s", type(err).__name__, err)
|
||||
logger.error("Can't connect to streamer: %s", tools.efmt(err))
|
||||
except Exception:
|
||||
logger.exception("Invalid streamer response from /snapshot")
|
||||
return None
|
||||
|
||||
@@ -50,6 +50,8 @@ from ...clients.streamer import BaseStreamerClient
|
||||
from ...clients.streamer import StreamerHttpClient
|
||||
from ...clients.streamer import StreamerMemsinkClient
|
||||
|
||||
from ... import tools
|
||||
|
||||
from .rfb import RfbClient
|
||||
from .rfb.stream import rfb_format_remote
|
||||
from .rfb.stream import rfb_close_writer
|
||||
@@ -397,7 +399,7 @@ class VncServer: # pylint: disable=too-many-instance-attributes
|
||||
async with kvmd.make_session("", "") as kvmd_session:
|
||||
none_auth_only = await kvmd_session.auth.check()
|
||||
except (aiohttp.ClientError, asyncio.TimeoutError) as err:
|
||||
logger.error("[entry] %s: Can't check KVMD auth mode: %s: %s", remote, type(err).__name__, err)
|
||||
logger.error("[entry] %s: Can't check KVMD auth mode: %s", remote, tools.efmt(err))
|
||||
return
|
||||
|
||||
await _Client(
|
||||
|
||||
Reference in New Issue
Block a user