From e8586cf60e2b55937207053f9d803bb2ff3b1e4d Mon Sep 17 00:00:00 2001 From: Kevin Landreth Date: Sat, 13 Oct 2012 21:51:55 -0500 Subject: [PATCH 1/2] Catch all errors during file upload --- slbackup.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/slbackup.py b/slbackup.py index c0d1fd2..14901df 100755 --- a/slbackup.py +++ b/slbackup.py @@ -363,11 +363,19 @@ def upload_files(_container, jobs): except: logging.info("Uploader exiting") break - obj = container.storage_object(target) - obj.create() - l.warn("Uploading file %s", obj.name) - chunk_upload(obj, _file) - l.warn("Finished file %s ", obj.name) + + try: + obj = container.storage_object(target) + obj.create() + l.warn("Uploading file %s", obj.name) + chunk_upload(obj, _file) + l.warn("Finished file %s ", obj.name) + except Exception, e: + l.error("Failed to upload %s, requeueing", _file) + l.exception(e) + jobs.put((_file, target,)) + # in case we got disconnected, reset the container + container = get_container(_container) def chunk_upload(obj, filename, headers=None): From ed6979333a13bc1910a7f3fbafb17612804eda7c Mon Sep 17 00:00:00 2001 From: Kevin Landreth Date: Mon, 15 Oct 2012 11:30:25 -0500 Subject: [PATCH 2/2] remove disconnected exception --- slbackup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/slbackup.py b/slbackup.py index 14901df..a737d4d 100755 --- a/slbackup.py +++ b/slbackup.py @@ -372,7 +372,6 @@ def upload_files(_container, jobs): l.warn("Finished file %s ", obj.name) except Exception, e: l.error("Failed to upload %s, requeueing", _file) - l.exception(e) jobs.put((_file, target,)) # in case we got disconnected, reset the container container = get_container(_container)