From e990e6fdfaf75c68897941aa2e25ead4e17a3a8b Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Mon, 3 Jun 2019 14:37:43 +0200 Subject: [PATCH] Update helpers.py --- esphome/helpers.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/esphome/helpers.py b/esphome/helpers.py index dcfbc2161e..30a06d842f 100644 --- a/esphome/helpers.py +++ b/esphome/helpers.py @@ -127,15 +127,20 @@ def resolve_ip_address(host): from esphome.core import EsphomeError import socket + errs = [] + if host.endswith('.local'): - return _resolve_with_zeroconf(host) + try: + return _resolve_with_zeroconf(host) + except EsphomeError as err: + errs.append(str(err)) try: - ip = socket.gethostbyname(host) + return socket.gethostbyname(host) except socket.error as err: - raise EsphomeError("Error resolving IP address: {}".format(err)) - - return ip + errs.append(str(err)) + raise EsphomeError("Error resolving IP address: {}" + "".format(', '.join(errs))) def get_bool_env(var, default=False):