diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-24 12:58:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 12:58:37 -0500 |
| commit | 36501068d8f4d2e360b647b677cee99f91f8c4e6 (patch) | |
| tree | 8f2353d312937f62a3dc0b60713625b18d4be332 /synapse/storage | |
| parent | Merge pull request #3245 from NotAFile/batch-iter (diff) | |
| parent | use stand-in value if maxint is not available (diff) | |
| download | synapse-36501068d8f4d2e360b647b677cee99f91f8c4e6.tar.xz | |
Merge pull request #3247 from NotAFile/py3-misc
Misc Python3 fixes
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 2262776ab2..962cc270bc 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -30,6 +30,12 @@ import threading logger = logging.getLogger(__name__) +try: + MAX_TXN_ID = sys.maxint - 1 +except AttributeError: + # python 3 does not have a maximum int value + MAX_TXN_ID = 2**63 - 1 + sql_logger = logging.getLogger("synapse.storage.SQL") transaction_logger = logging.getLogger("synapse.storage.txn") perf_logger = logging.getLogger("synapse.storage.TIME") @@ -222,7 +228,7 @@ class SQLBaseStore(object): # We don't really need these to be unique, so lets stop it from # growing really large. - self._TXN_ID = (self._TXN_ID + 1) % (sys.maxint - 1) + self._TXN_ID = (self._TXN_ID + 1) % (MAX_TXN_ID) name = "%s-%x" % (desc, txn_id, ) |