server: refactor get_host_info method
Return a dict with the host name, server address, server port, and ssl port. Signed-off-by: Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
parent
16c8063900
commit
7a99f83396
@ -87,8 +87,8 @@ class Authorization:
|
|||||||
}
|
}
|
||||||
else:
|
else:
|
||||||
self.api_key = api_user['api_key']
|
self.api_key = api_user['api_key']
|
||||||
host_name, port = self.server.get_host_info()
|
hi = self.server.get_host_info()
|
||||||
self.issuer = f"http://{host_name}:{port}"
|
self.issuer = f"http://{hi['hostname']}:{hi['port']}"
|
||||||
self.public_jwks: Dict[str, Dict[str, Any]] = {}
|
self.public_jwks: Dict[str, Dict[str, Any]] = {}
|
||||||
for username, user_info in list(self.users.items()):
|
for username, user_info in list(self.users.items()):
|
||||||
if username == API_USER:
|
if username == API_USER:
|
||||||
|
@ -37,13 +37,14 @@ class ZeroconfRegistrar():
|
|||||||
self.server = config.get_server()
|
self.server = config.get_server()
|
||||||
self.event_loop = self.server.get_event_loop()
|
self.event_loop = self.server.get_event_loop()
|
||||||
|
|
||||||
host_name, port = self.server.get_host_info()
|
hi = self.server.get_host_info()
|
||||||
|
host_name = hi['hostname']
|
||||||
addresses = [socket.gethostbyname(host_name)]
|
addresses = [socket.gethostbyname(host_name)]
|
||||||
self.service_info = AsyncServiceInfo(
|
self.service_info = AsyncServiceInfo(
|
||||||
"_moonraker._tcp.local.",
|
"_moonraker._tcp.local.",
|
||||||
f"{host_name}._moonraker._tcp.local.",
|
f"{host_name}._moonraker._tcp.local.",
|
||||||
addresses=addresses,
|
addresses=addresses,
|
||||||
port=port,
|
port=hi['port'],
|
||||||
properties={'path': '/'},
|
properties={'path': '/'},
|
||||||
server=f"{host_name}.local."
|
server=f"{host_name}.local."
|
||||||
)
|
)
|
||||||
|
@ -174,10 +174,9 @@ class Server:
|
|||||||
await asyncio.gather(*optional_comps)
|
await asyncio.gather(*optional_comps)
|
||||||
|
|
||||||
# Start HTTP Server
|
# Start HTTP Server
|
||||||
hostname, hostport = self.get_host_info()
|
|
||||||
logging.info(
|
logging.info(
|
||||||
f"Starting Moonraker on ({self.host}, {hostport}), "
|
f"Starting Moonraker on ({self.host}, {self.port}), "
|
||||||
f"Hostname: {hostname}")
|
f"Hostname: {socket.gethostname()}")
|
||||||
self.moonraker_app.listen(self.host, self.port, self.ssl_port)
|
self.moonraker_app.listen(self.host, self.port, self.ssl_port)
|
||||||
self.server_running = True
|
self.server_running = True
|
||||||
await self._connect_klippy()
|
await self._connect_klippy()
|
||||||
@ -309,9 +308,13 @@ class Server:
|
|||||||
# These methods need to be registered with Klippy
|
# These methods need to be registered with Klippy
|
||||||
self.klippy_reg_methods.append(method_name)
|
self.klippy_reg_methods.append(method_name)
|
||||||
|
|
||||||
def get_host_info(self) -> Tuple[str, int]:
|
def get_host_info(self) -> Dict[str, Any]:
|
||||||
hostname = socket.gethostname()
|
return {
|
||||||
return hostname, self.port
|
'hostname': socket.gethostname(),
|
||||||
|
'address': self.host,
|
||||||
|
'port': self.port,
|
||||||
|
'ssl_port': self.ssl_port
|
||||||
|
}
|
||||||
|
|
||||||
def get_klippy_info(self) -> Dict[str, Any]:
|
def get_klippy_info(self) -> Dict[str, Any]:
|
||||||
return dict(self.klippy_info)
|
return dict(self.klippy_info)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user