iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle FlushError in transfer_file_to_matrix

Browse Source
This commit is contained in:
Tulir Asokan
2018-03-09 23:42:33 +02:00
parent c98e822e6d
commit 77c57eb64b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/util/file_transfer.py
+5
View File
@@ -20,6 +20,7 @@ import logging
import magic import magic
from sqlalchemy.exc import IntegrityError, InvalidRequestError from sqlalchemy.exc import IntegrityError, InvalidRequestError
from sqlalchemy.orm.exc import FlushError
try: try:
from PIL import Image from PIL import Image
except ImportError: except ImportError:
@@ -158,6 +159,10 @@ async def transfer_file_to_matrix(db, client, intent, location, thumbnail=None):
try: try:
db.add(db_file) db.add(db_file)
db.commit() db.commit()
except FlushError as e:
log.exception(f"{e.__class__.__name__} while saving transferred file data. "
"This was probably caused by two simultaneous transfers of the same file, "
"and should not cause any problems.")
except (IntegrityError, InvalidRequestError) as e: except (IntegrityError, InvalidRequestError) as e:
db.rollback() db.rollback()
log.exception(f"{e.__class__.__name__} while saving transferred file data. " log.exception(f"{e.__class__.__name__} while saving transferred file data. "