From 2a46d71fc885201d88ca63bc52d26ef715545a23 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 13 May 2024 16:02:28 -0700 Subject: [PATCH] logreader: skip internal source if connection refused (#32418) * logreader: skip internal source if connection refused * fix indentation * fix spacing * explicit ipv4 and tcp --- tools/lib/filereader.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/lib/filereader.py b/tools/lib/filereader.py index e9b8b4b2ce..3bfdc75feb 100644 --- a/tools/lib/filereader.py +++ b/tools/lib/filereader.py @@ -10,10 +10,11 @@ DATA_ENDPOINT = os.getenv("DATA_ENDPOINT", "http://data-raw.comma.internal/") def internal_source_available(): try: hostname = urlparse(DATA_ENDPOINT).hostname - if hostname: - socket.gethostbyname(hostname) - return True - except socket.gaierror: + port = urlparse(DATA_ENDPOINT).port or 80 + with socket.socket(socket.AF_INET,socket.SOCK_STREAM) as s: + s.connect((hostname, port)) + return True + except (socket.gaierror, ConnectionRefusedError): pass return False