vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #7922 from saurabh6790/develop

Browse source 
fix: handle JobTimeoutException for s3
This commit is contained in:
Saurabh 2019-07-19 18:16:38 +05:30 • committed by GitHub
commit 6ac1024f11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
View file

@ -66,15 +66,26 @@ def take_backups_if(freq):
@frappe.whitelist()
def take_backups_s3():
def take_backups_s3(retry_count=0):
try:
backup_to_s3()
send_email(True, "S3 Backup Settings")
except JobTimeoutException:
if retry_count < 2:
args = {
"retry_count" :retry_count + 1
}
enqueue("frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_s3",
queue='long', timeout=1500, **args)
else:
notify()
except Exception:
error_message = frappe.get_traceback()
frappe.errprint(error_message)
send_email(False, "S3 Backup Settings", error_message)
notify()
def notify():
error_message = frappe.get_traceback()
frappe.errprint(error_message)
send_email(False, "S3 Backup Settings", error_message)
def send_email(success, service_name, error_status=None):
if success:
@ -134,6 +145,7 @@ def upload_file_to_s3(filename, folder, conn, bucket):
conn.upload_file(filename, bucket, destpath)
except Exception as e:
frappe.log_error()
print("Error uploading: %s" % (e))