diff options
Diffstat (limited to 'kvmd/clients')
| -rw-r--r-- | kvmd/clients/kvmd.py | 9 | ||||
| -rw-r--r-- | kvmd/clients/streamer.py | 10 |
2 files changed, 4 insertions, 15 deletions
diff --git a/kvmd/clients/kvmd.py b/kvmd/clients/kvmd.py index d3d91094..84576fb2 100644 --- a/kvmd/clients/kvmd.py +++ b/kvmd/clients/kvmd.py @@ -245,15 +245,11 @@ class KvmdClientSession: class KvmdClient: def __init__( self, - host: str, - port: int, unix_path: str, timeout: float, user_agent: str, ) -> None: - self.__host = host - self.__port = port self.__unix_path = unix_path self.__timeout = timeout self.__user_agent = user_agent @@ -271,12 +267,11 @@ class KvmdClient: "X-KVMD-Passwd": passwd, "User-Agent": self.__user_agent, }, + "connector": aiohttp.UnixConnector(path=self.__unix_path), "timeout": aiohttp.ClientTimeout(total=self.__timeout), } - if self.__unix_path: - kwargs["connector"] = aiohttp.UnixConnector(path=self.__unix_path) return aiohttp.ClientSession(**kwargs) def __make_url(self, handle: str) -> str: assert not handle.startswith("/"), handle - return f"http://{self.__host}:{self.__port}/{handle}" + return f"http://localhost:0/{handle}" diff --git a/kvmd/clients/streamer.py b/kvmd/clients/streamer.py index 35006ede..dd4167f9 100644 --- a/kvmd/clients/streamer.py +++ b/kvmd/clients/streamer.py @@ -71,17 +71,12 @@ class HttpStreamerClient(BaseStreamerClient): def __init__( self, name: str, - host: str, - port: int, unix_path: str, timeout: float, user_agent: str, ) -> None: - assert port or unix_path self.__name = name - self.__host = host - self.__port = port self.__unix_path = unix_path self.__timeout = timeout self.__user_agent = user_agent @@ -125,18 +120,17 @@ class HttpStreamerClient(BaseStreamerClient): def __make_http_session(self) -> aiohttp.ClientSession: kwargs: Dict = { "headers": {"User-Agent": self.__user_agent}, + "connector": aiohttp.UnixConnector(path=self.__unix_path), "timeout": aiohttp.ClientTimeout( connect=self.__timeout, sock_read=self.__timeout, ), } - if self.__unix_path: - kwargs["connector"] = aiohttp.UnixConnector(path=self.__unix_path) return aiohttp.ClientSession(**kwargs) def __make_url(self, handle: str) -> str: assert not handle.startswith("/"), handle - return f"http://{self.__host}:{self.__port}/{handle}" + return f"http://localhost:0/{handle}" def __patch_stream_reader(self, reader: aiohttp.StreamReader) -> None: # https://github.com/pikvm/pikvm/issues/92 |