LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-26 11:23:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add cross-thread safety when saving the session

Browse Source
This commit is contained in:
Lonami Exo 2017-10-01 13:26:33 +02:00
parent a737f33324
commit e4c5396c04
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telethon/tl/session.py
View File

@ -53,7 +53,9 @@ class Session:
self.report_errors = True self.report_errors = True
# Cross-thread safety # Cross-thread safety
self._lock = Lock() self._seq_no_lock = Lock()
self._msg_id_lock = Lock()
self._save_lock = Lock()
self.id = helpers.generate_random_long(signed=False) self.id = helpers.generate_random_long(signed=False)
self._sequence = 0 self._sequence = 0
@ -71,7 +73,10 @@ class Session:
def save(self): def save(self):
"""Saves the current session object as session_user_id.session""" """Saves the current session object as session_user_id.session"""
if self.session_user_id: if not self.session_user_id or self._save_lock.locked():
return
with self._save_lock:
with open('{}.session'.format(self.session_user_id), 'w') as file: with open('{}.session'.format(self.session_user_id), 'w') as file:
json.dump({ json.dump({
'port': self.port, 'port': self.port,
@ -144,7 +149,7 @@ class Session:
Note that if confirmed=True, the sequence number Note that if confirmed=True, the sequence number
will be increased by one too will be increased by one too
""" """
with self._lock: with self._seq_no_lock:
if content_related: if content_related:
result = self._sequence * 2 + 1 result = self._sequence * 2 + 1
self._sequence += 1 self._sequence += 1
@ -161,7 +166,7 @@ class Session:
# "message identifiers are divisible by 4" # "message identifiers are divisible by 4"
new_msg_id = (int(now) << 32) | (nanoseconds << 2) new_msg_id = (int(now) << 32) | (nanoseconds << 2)
with self._lock: with self._msg_id_lock:
if self._last_msg_id >= new_msg_id: if self._last_msg_id >= new_msg_id:
new_msg_id = self._last_msg_id + 4 new_msg_id = self._last_msg_id + 4