OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove unnecessary SystemRandom from SQLBaseStore (#9987) 

It's not obvious that instances of SQLBaseStore each need their own
instances of random.SystemRandom(); let's just use random directly.

Introduced by 52839886d6

Signed-off-by: Dan Callahan <danc@element.io>
pull/9989/head
Dan Callahan 2021-05-14 10:59:10 +01:00 committed by GitHub
parent ebdef256b3
commit 52ed9655ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9987.misc Normal file
View File

@ -0,0 +1 @@
Remove unnecessary property from SQLBaseStore.

2
synapse/storage/_base.py
View File

@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import logging import logging
import random
from abc import ABCMeta from abc import ABCMeta
from typing import TYPE_CHECKING, Any, Collection, Iterable, Optional, Union from typing import TYPE_CHECKING, Any, Collection, Iterable, Optional, Union
@ -44,7 +43,6 @@ class SQLBaseStore(metaclass=ABCMeta):
self._clock = hs.get_clock() self._clock = hs.get_clock()
self.database_engine = database.engine self.database_engine = database.engine
self.db_pool = database self.db_pool = database
self.rand = random.SystemRandom()
def process_replication_rows( def process_replication_rows(
self, self,

3
synapse/storage/databases/main/registration.py
View File

@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import logging import logging
import random
import re import re
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
@ -997,7 +998,7 @@ class RegistrationWorkerStore(CacheInvalidationWorkerStore):
expiration_ts = now_ms + self._account_validity_period expiration_ts = now_ms + self._account_validity_period
if use_delta: if use_delta:
expiration_ts = self.rand.randrange( expiration_ts = random.randrange(
expiration_ts - self._account_validity_startup_job_max_delta, expiration_ts - self._account_validity_startup_job_max_delta,
expiration_ts, expiration_ts,
) )