jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-13 04:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle both cases of bind failures (#2099)

Browse Source
This commit is contained in:
Joakim Sørensen 2020-10-06 11:28:09 +02:00 committed by GitHub
parent 38db375fea
commit 9dc2f43ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
supervisor/utils/log_format.py
View File

@ -6,7 +6,9 @@ import sentry_sdk
_LOGGER: logging.Logger = logging.getLogger(__name__) _LOGGER: logging.Logger = logging.getLogger(__name__)
RE_BIND_FAILED = re.compile(r".*Bind for.*:(\d*) failed: port is already allocated.*") RE_BIND_FAILED = re.compile(
r".*[listen tcp|Bind for].*(?:[0-9]{1,3}\.){3}[0-9]{1,3}:(\d*).*[bind|failed]:[address already in use|port is already allocated].*"
)
def format_message(message: str) -> str: def format_message(message: str) -> str:

11
tests/utils/test_log_format.py
View File

@ -2,7 +2,7 @@
from supervisor.utils.log_format import format_message from supervisor.utils.log_format import format_message
def test_format_message(): def test_format_message_port():
"""Tests for message formater.""" """Tests for message formater."""
message = '500 Server Error: Internal Server Error: Bind for 0.0.0.0:80 failed: port is already allocated")' message = '500 Server Error: Internal Server Error: Bind for 0.0.0.0:80 failed: port is already allocated")'
assert ( assert (
@ -11,6 +11,15 @@ def test_format_message():
) )
def test_format_message_port_alternative():
"""Tests for message formater."""
message = 'Error starting userland proxy: listen tcp 0.0.0.0:80: bind: address already in use")'
assert (
format_message(message)
== "Port '80' is already in use by something else on the host."
)
def test_exeption(): def test_exeption():
"""Tests the exception handling.""" """Tests the exception handling."""
message = b"byte" message = b"byte"