3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

application: add error handling to listen() 

It is possible that Moonraker cannot bind to an address if its
already in use.  Handle bind errors and warn/log when they are
encountered.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2024-01-14 12:45:12 -05:00
parent 7beca7a1a3
commit 619a588683
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
moonraker/components/application.py
View File

@ -288,6 +288,13 @@ class MoonrakerApp:
host = "" host = ""
self.http_server = self._create_http_server(port, host) self.http_server = self._create_http_server(port, host)
if self.https_enabled(): if self.https_enabled():
if port == ssl_port:
self.server.add_warning(
"Failed to start HTTPS server. Server options 'port' and "
f"'ssl_port' match, both set to {port}. Modify the "
"configuration to use different ports."
)
return
logging.info(f"Starting secure server on port {ssl_port}") logging.info(f"Starting secure server on port {ssl_port}")
ssl_ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) ssl_ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
ssl_ctx.load_cert_chain(self.cert_path, self.key_path) ssl_ctx.load_cert_chain(self.cert_path, self.key_path)
@ -295,14 +302,26 @@ class MoonrakerApp:
ssl_port, host, ssl_options=ssl_ctx ssl_port, host, ssl_options=ssl_ctx
) )
else: else:
logging.info("SSL Certificate/Key not configured, " logging.info(
"aborting HTTPS Server startup") "SSL Certificate/Key not configured, aborting HTTPS Server startup"
)
def _create_http_server(self, port: int, address: str, **kwargs) -> HTTPServer: def _create_http_server(
self, port: int, address: str, **kwargs
) -> Optional[HTTPServer]:
args: Dict[str, Any] = dict(max_body_size=MAX_BODY_SIZE, xheaders=True) args: Dict[str, Any] = dict(max_body_size=MAX_BODY_SIZE, xheaders=True)
args.update(kwargs) args.update(kwargs)
svr = HTTPServer(self.mutable_router, **args) svr = HTTPServer(self.mutable_router, **args)
try:
svr.listen(port, address) svr.listen(port, address)
except Exception as e:
svr_type = "HTTPS" if "ssl_options" in args else "HTTP"
logging.exception(f"{svr_type} Server Start Failed")
self.server.add_warning(
f"Failed to start {svr_type} server: {e}. See moonraker.log "
"for more details."
)
return None
return svr return svr
def get_server(self) -> Server: def get_server(self) -> Server: