mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-29 05:18:10 +00:00
Code Issues Releases Wiki Activity

Lock dispatcher groups. Fixes #255

Browse Source
This commit is contained in:
Dan 2019-06-21 01:53:17 +02:00
parent 0699bd31e5
commit 8d0e161b56
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pyrogram/client/ext/dispatcher.py
View File

@ -20,7 +20,7 @@ import logging
import threading import threading
from collections import OrderedDict from collections import OrderedDict
from queue import Queue from queue import Queue
from threading import Thread from threading import Thread, Lock
import pyrogram import pyrogram
from pyrogram.api import types from pyrogram.api import types
@ -64,6 +64,8 @@ class Dispatcher:
self.updates_queue = Queue() self.updates_queue = Queue()
self.groups = OrderedDict() self.groups = OrderedDict()
self.lock = Lock()
self.update_parsers = { self.update_parsers = {
Dispatcher.MESSAGE_UPDATES: Dispatcher.MESSAGE_UPDATES:
lambda upd, usr, cht: (pyrogram.Message._parse(self.client, upd.message, usr, cht), MessageHandler), lambda upd, usr, cht: (pyrogram.Message._parse(self.client, upd.message, usr, cht), MessageHandler),
@ -110,17 +112,19 @@ class Dispatcher:
self.groups.clear() self.groups.clear()
def add_handler(self, handler, group: int): def add_handler(self, handler, group: int):
if group not in self.groups: with self.lock:
self.groups[group] = [] if group not in self.groups:
self.groups = OrderedDict(sorted(self.groups.items())) self.groups[group] = []
self.groups = OrderedDict(sorted(self.groups.items()))
self.groups[group].append(handler) self.groups[group].append(handler)
def remove_handler(self, handler, group: int): def remove_handler(self, handler, group: int):
if group not in self.groups: with self.lock:
raise ValueError("Group {} does not exist. Handler was not removed.".format(group)) if group not in self.groups:
raise ValueError("Group {} does not exist. Handler was not removed.".format(group))
self.groups[group].remove(handler) self.groups[group].remove(handler)
def update_worker(self): def update_worker(self):
name = threading.current_thread().name name = threading.current_thread().name
@ -142,29 +146,30 @@ class Dispatcher:
else (None, type(None)) else (None, type(None))
) )
for group in self.groups.values(): with self.lock:
for handler in group: for group in self.groups.values():
args = None for handler in group:
args = None
if isinstance(handler, handler_type): if isinstance(handler, handler_type):
if handler.check(parsed_update): if handler.check(parsed_update):
args = (parsed_update,) args = (parsed_update,)
elif isinstance(handler, RawUpdateHandler): elif isinstance(handler, RawUpdateHandler):
args = (update, users, chats) args = (update, users, chats)
if args is None: if args is None:
continue continue
try: try:
handler.callback(self.client, *args) handler.callback(self.client, *args)
except pyrogram.StopPropagation: except pyrogram.StopPropagation:
raise raise
except pyrogram.ContinuePropagation: except pyrogram.ContinuePropagation:
continue continue
except Exception as e: except Exception as e:
log.error(e, exc_info=True) log.error(e, exc_info=True)
break break
except pyrogram.StopPropagation: except pyrogram.StopPropagation:
pass pass
except Exception as e: except Exception as e: