Merge branch 'Mailu:master' into patch-1

master
willofr 3 years ago committed by GitHub
commit 73f5291cdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -66,10 +66,10 @@ def has_dane_record(domain, timeout=10):
return app.config['DEFER_ON_TLS_ERROR'] return app.config['DEFER_ON_TLS_ERROR']
except dns.exception.Timeout: except dns.exception.Timeout:
app.logger.warn(f'Timeout while resolving the TLSA record for {domain} ({timeout}s).') app.logger.warn(f'Timeout while resolving the TLSA record for {domain} ({timeout}s).')
except dns.resolver.NXDOMAIN: except (dns.resolver.NXDOMAIN, dns.name.EmptyLabel):
pass # this is expected, not TLSA record is fine pass # this is expected, not TLSA record is fine
except Exception as e: except Exception as e:
app.logger.error(f'Error while looking up the TLSA record for {domain} {e}') app.logger.info(f'Error while looking up the TLSA record for {domain} {e}')
pass pass
# Rate limiter # Rate limiter

Loading…
Cancel
Save