From 7f488a984b7055f65c03cb1d59e5d7c5c07012e4 Mon Sep 17 00:00:00 2001 From: Sheppy Date: Sun, 29 Dec 2024 15:05:36 +0000 Subject: [PATCH] fix: don't crash on inaccessible host --- backup.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/backup.py b/backup.py index 4c4bc70..4208ade 100644 --- a/backup.py +++ b/backup.py @@ -185,12 +185,20 @@ def sizeChanged(hostname, pathsToOptions, path): return True # check server # - cmd = ["ssh", hostname, "-t", "/opt/check_dir_size_for_backup.py", path ] + cmd = [ + "ssh", hostname, + "-o", "PasswordAuthentication=no", + "-o", "ConnectTimeout=3", + "-t", "/opt/check_dir_size_for_backup.py", + path + ] + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, encoding="utf-8") stdout, stderr = p.communicate() if p.wait() != 0: - raise OSError("ssh commmand for backup size info failed '{}' - '{}' Host: {}".format( + print("Warning: ssh commmand for backup size info failed '{}' - '{}' Host: {}".format( stderr, stdout, hostname)) + return [] # parse response # result = json.loads(stdout)