scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-30 17:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 use resolver.resolve

Browse Source 
(cherry picked from commit 90394d7d8c)

# Conflicts:
#	core/admin/start.py
This commit is contained in:
Billy Chan
2022-01-21 21:17:37 +08:00
committed by Mergify
parent 9e7eda91f0
commit 4dde4856ac
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/admin/start.py
View File

@@ -50,11 +50,15 @@ def test_DNS():
resolver.nameservers=[ns] resolver.nameservers=[ns]
while True: while True:
try: try:
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
result = resolver.resolve('example.org', dns.rdatatype.A, dns.rdataclass.IN, lifetime=10) result = resolver.resolve('example.org', dns.rdatatype.A, dns.rdataclass.IN, lifetime=10)
======= =======
result = resolver.query('example.org.', dns.rdatatype.A, dns.rdataclass.IN, lifetime=10) result = resolver.query('example.org.', dns.rdatatype.A, dns.rdataclass.IN, lifetime=10)
>>>>>>> 32446f03 (Update start.py) >>>>>>> 32446f03 (Update start.py)
=======
result = resolver.resolve('example.org', dns.rdatatype.A, dns.rdataclass.IN, lifetime=10)
>>>>>>> 90394d7d (:art: use resolver.resolve)
except Exception as e: except Exception as e:
log.critical("Your DNS resolver at %s is not working (%s). Please see https://mailu.io/master/faq.html#the-admin-container-won-t-start-and-its-log-says-critical-your-dns-resolver-isn-t-doing-dnssec-validation", ns, e) log.critical("Your DNS resolver at %s is not working (%s). Please see https://mailu.io/master/faq.html#the-admin-container-won-t-start-and-its-log-says-critical-your-dns-resolver-isn-t-doing-dnssec-validation", ns, e)
else: else: