tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #139 from 0pointerexception/fix-multithreading-mode-check

Browse Source 
LocalStatusSQLite.py: version aware threadsafety check (fixes #136)
This commit is contained in:
Rodolfo García Peñas (kix) 2022-12-05 11:38:27 +01:00 committed by GitHub
commit 0a5994e7b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
offlineimap/folder/LocalStatusSQLite.py
View File

@ -17,7 +17,7 @@
import os import os
import sqlite3 as sqlite import sqlite3 as sqlite
from sys import exc_info from sys import exc_info,version_info
from threading import Lock from threading import Lock
from .Base import BaseFolder from .Base import BaseFolder
@ -75,6 +75,11 @@ class LocalStatusSQLiteFolder(BaseFolder):
self.filename = os.path.join(self.getroot(), self.getfolderbasename()) self.filename = os.path.join(self.getroot(), self.getfolderbasename())
self._newfolder = False # Flag if the folder is new. self._newfolder = False # Flag if the folder is new.
"""
sqlite threading mode must be 3 as of Python 3.11, checking against
1 for versions below Python 3.11 to sustain backwards compatibility.
"""
self._threading_mode_const = 3 if version_info.minor >=11 else 1
dirname = os.path.dirname(self.filename) dirname = os.path.dirname(self.filename)
if not os.path.exists(dirname): if not os.path.exists(dirname):
@ -102,9 +107,10 @@ class LocalStatusSQLiteFolder(BaseFolder):
if self._in_transactions < 1: if self._in_transactions < 1:
self.connection.commit() self.connection.commit()
def openfiles(self): def openfiles(self):
# Make sure sqlite is in multithreading SERIALIZE mode. # Make sure sqlite is in multithreading SERIALIZE mode.
assert sqlite.threadsafety == 1, 'Your sqlite is not multithreading safe.' assert sqlite.threadsafety == self._threading_mode_const, 'Your sqlite is not multithreading safe.'
with self._databaseFileLock.getLock(): with self._databaseFileLock.getLock():
# Try to establish connection, no need for threadsafety in __init__. # Try to establish connection, no need for threadsafety in __init__.