h3artbl33d/chatmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DNS: error if can't connect with SSH. fixes #144

Browse Source
This commit is contained in:
missytake 2023-12-20 14:55:31 +01:00
parent b626464453
commit b426c2e7ff
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmdeploy/src/cmdeploy/dns.py
View File

@ -13,22 +13,18 @@ class DNS:
self.out = out self.out = out
self.ssh = f"ssh root@{mail_domain} -- " self.ssh = f"ssh root@{mail_domain} -- "
try: try:
self.shell(f"unbound-control flush {mail_domain}", retry_local=False) self.shell(f"unbound-control flush {mail_domain}")
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
pass pass
def shell(self, cmd, retry_local=False): def shell(self, cmd):
try: try:
return self.out.shell_output(f"{self.ssh}{cmd}", no_print=True, timeout=3) return self.out.shell_output(f"{self.ssh}{cmd}", no_print=True, timeout=3)
except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e: except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
str(e)
if retry_local:
return self.out.shell_output(f"{cmd}", no_print=True)
else:
if "exit status 255" in str(e) or "timed out" in str(e): if "exit status 255" in str(e) or "timed out" in str(e):
self.out.red(f"\nError: can't reach the server with: {self.ssh[:-4]}") self.out.red(f"Error: can't reach the server with: {self.ssh[:-4]}")
sys.exit(1) sys.exit(1)
if e == subprocess.CalledProcessError: else:
raise raise
def get_ipv4(self): def get_ipv4(self):
@ -41,7 +37,7 @@ class DNS:
def get(self, typ: str, domain: str) -> str | None: def get(self, typ: str, domain: str) -> str | None:
"""Get a DNS entry""" """Get a DNS entry"""
dig_result = self.shell(f"dig {typ} {domain}", retry_local=True) dig_result = self.shell(f"dig {typ} {domain}")
line_num = 0 line_num = 0
for line in dig_result.splitlines(): for line in dig_result.splitlines():
line_num += 1 line_num += 1