瀏覽代碼

[IMP] error handler

robert 5 年之前
父節點
當前提交
b6ab5a1971
共有 2 個文件被更改,包括 16 次插入10 次删除
  1. 14 8
      backup.py
  2. 2 2
      token.pickle

+ 14 - 8
backup.py

@@ -223,6 +223,7 @@ def upload_postgres_to_drive(backup_file_name, backup_folder_id, docket_client,
     for chunk in backup_file:
         raw_data.write(chunk)
 
+    raw_data.close()
     raw_data.seek(0)
 
     backup_metadata = {
@@ -231,10 +232,12 @@ def upload_postgres_to_drive(backup_file_name, backup_folder_id, docket_client,
     }
     backup_media = MediaIoBaseUpload(raw_data, mimetype='application/tar', chunksize=2*(1024*1024))
 
-    result = service.files().create(body=backup_metadata, media_body=backup_media).execute()
-    raw_data.close()
-
-    return result.get('id')
+    try:
+        result = service.files().create(body=backup_metadata, media_body=backup_media).execute()
+        return result.get('id')
+    except Exception:
+        log('Error al subir copia de seguridad de la base de datos: %s' % backup_file_name)
+        return None
 
 '''
 '''
@@ -249,11 +252,14 @@ def upload_filestore_to_drive(backup_path, backup_folder_id, service):
         'name': backup_name,
         'parents': [backup_folder_id]
     }
-
     backup_media = MediaFileUpload(backup_path, mimetype='application/tar', chunksize=2*(1024*1024))
 
-    result = service.files().create(body=backup_metadata, media_body=backup_media).execute()
-    return result.get('id')
+    try:
+        result = service.files().create(body=backup_metadata, media_body=backup_media).execute()
+        return result.get('id')
+    except Exception:
+        log('Error al subir copia de seguridad de los archivos adjuntos: %s' % backup_name)
+        return None
 
 '''
 '''
@@ -312,7 +318,7 @@ def run_backup():
     # 8. backup databases
     for index, db in enumerate(databases):
         log('Procesando %d de %d' % (index, len(databases)))
-
+        
         (backup_ok, backup_name) = create_postgres_backup(db, docker_client)
 
         if not backup_ok:

+ 2 - 2
token.pickle

@@ -23,7 +23,7 @@ asS'_id_token'
 p11
 NsS'token'
 p12
-Vya29.GlwgB3pAD1YUluNw0K2kGT3692PB4DtqEy3xBtNkz-8HAtgFNkyp7YJ7An4zU21ul68KBfp4sV7E5A9_z9642Id3kGqzYSAXhJx6eSV04xxtPISKFA4nIGwZdML2PQ
+Vya29.GlwgBxJPmNnCR9YNP-6Y1pndcskTNmVip7-8PKGilS1GK1jcf5tqZKqTwiEoFQVQMCxk464bD0KLRRKMvr5tXc1vqvD9mnXokdd7EthxiA3k9u2bpSzS5YnbSKYM5w
 p13
 sS'_refresh_token'
 p14
@@ -42,7 +42,7 @@ p20
 cdatetime
 datetime
 p21
-(S'\x07\xe3\x06\x06\r8\x07\x02+^'
+(S'\x07\xe3\x06\x06\x0f\x08\x01\x02\x81\x9c'
 p22
 tp23
 Rp24