Refactor and add some error handling.

diff --git a/butterbackup.py b/butterbackup.py
index a7c7843647573762c0bb2c1acb7188129bc41129..a049efc0d9b66465badadaf134da2375bcd27b9b 100755 (executable)
--- a/butterbackup.py
+++ b/butterbackup.py
@@ -1,44 +1,53 @@
 #!/usr/bin/env python3
 import os
 import sys
 #!/usr/bin/env python3
 import os
 import sys

-from subprocess import Popen, PIPE
+from subprocess import check_call

 import shlex
 import datetime
 import shlex
 import datetime

+class BackupRunner():
+    def __init__(self, config_dir, dest_dir):
+        self.config_dir = config_dir
+        self.dest_dir = dest_dir
+        if not os.path.exists(self.config_dir):
+            print("No config found", self.config_dir)
+            sys-exit(-1)

 
 

-def backup_host(host, base_dir, fp):
-    dest_dir = os.path.join(base_dir, host, "latest")
-    if not os.path.exists(base_dir):
-        print("New host",host,".")
-        run("btrfs subvol create %s"% os.path.join(base_dir, host)) 
-        os.makedirs(dest_dir)
-    command = ("rsync -a --numeric-ids --delete --delete-excluded --human-readable --inplace ")
-    excludes = fp.readline()[:-1]
-    (stdout,stderr) = run(command + excludes + " root@%s:/ "%(host) + dest_dir)
-    if stdout:
-        print(stdout)
-    if stderr:
-        print(stdout)
-    run("btrfs subvol snapshot %s %s"%(os.path.join(base_dir, host),os.path.join(base_dir, host, datetime.datetime.now().date().strftime("%F"))))
-    
-def run(cmd):
-    (stdout, stderr) = Popen(shlex.split(cmd), stdout=PIPE).communicate()
-    if stdout:
-        stdout = stdout.decode('utf-8')
-    if stderr:
-        stderr = stderr.decode('utf-8')   
-    return(stdout, stderr)
+    def run(self):
+        self.hosts = os.listdir(self.config_dir)
+        for host in self.hosts:
+            fp = open(os.path.join(self.config_dir, host),"r")
+            self.backup_host(host, fp)
+            fp.close()
+
+    def backup_host(self, host, host_config):
+        subvol_dir = os.path.join(self.dest_dir, host)
+        dest_dir = os.path.join(subvol_dir, "latest")
+        if not os.path.exists(subvol_dir):
+            print("New host",host,".")
+            try:
+                check_call(shlex.split("btrfs subvol create %s"% subvol_dir))
+            except subprocess.CalledProcessError as ex:
+                print("Failed to create subvol! Aborting backup.")
+                return() 
+            os.makedirs(dest_dir)
+        command = ("rsync --timeout=10 -a --numeric-ids --delete --delete-excluded --human-readable --inplace ")
+        excludes = host_config.readline()[:-1]
+        try:
+            check_call(shlex.split(command + excludes + " root@%s:/ "%(host) + dest_dir))
+        except subprocess.CalledProcessError as ex:
+            if ex.returncode not in (30, 255):
+                print("Rsync did not transfer anything, skipping snapshot.")
+                return()
+        todays_date = datetime.datetime.now().date().strftime("%F")
+        try:
+            check_call(shlex.split("btrfs subvol snapshot %s %s"%(subvol_dir,os.path.join(subvol_dir, todays_date))))
+        except subprocess.CalledProcessError as ex: 
+            pass

 
 if __name__ == "__main__":
     if os.geteuid() != 0:
         print("You need to be root. Otherwise all permissions will be lost.")
         sys.exit(-1)
 
 if __name__ == "__main__":
     if os.geteuid() != 0:
         print("You need to be root. Otherwise all permissions will be lost.")
         sys.exit(-1)

-    base_path="/etc/butterbackup"
-    dest_dir="/mnt/data2"
-    if not os.path.exists(base_path):
-        print("No hosts to backup, please place them in",base_path)
-        sys-exit(-1)
-    hosts = os.listdir(base_path)
-    for host in hosts:
-        fp = open(os.path.join(base_path, host),"r")
-        backup_host(host, dest_dir, fp)
+    br = BackupRunner("/etc/butterbackup", "/mnt/data2")
+    br.run()

     sys.exit(0)
     sys.exit(0)