From 7cee6b079fafb725e36a2431e468af85cebe85fe Mon Sep 17 00:00:00 2001 From: Dan <14043624+delivrance@users.noreply.github.com> Date: Thu, 8 Feb 2018 19:48:01 +0100 Subject: [PATCH] Revert to fixed NET_WORKERS count --- pyrogram/client/client.py | 6 ++---- pyrogram/session/session.py | 14 +++++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py index d61e37d6..7c17701f 100644 --- a/pyrogram/client/client.py +++ b/pyrogram/client/client.py @@ -156,8 +156,7 @@ class Client: self.test_mode, self.proxy, self.auth_key, - self.config.api_id, - net_workers=self.workers + self.config.api_id ) terms = self.session.start() @@ -262,8 +261,7 @@ class Client: self.test_mode, self.proxy, self.auth_key, - self.config.api_id, - net_workers=self.workers + self.config.api_id ) self.session.start() diff --git a/pyrogram/session/session.py b/pyrogram/session/session.py index a57d1717..db03f740 100644 --- a/pyrogram/session/session.py +++ b/pyrogram/session/session.py @@ -60,7 +60,7 @@ class Session: ) INITIAL_SALT = 0x616e67656c696361 - + NET_WORKERS = 4 WAIT_TIMEOUT = 10 MAX_RETRIES = 5 ACKS_THRESHOLD = 8 @@ -74,19 +74,15 @@ class Session: proxy: type, auth_key: bytes, api_id: str, - is_cdn: bool = False, - net_workers: int = 2): + is_cdn: bool = False): if not Session.notice_displayed: print("Pyrogram v{}, {}".format(__version__, __copyright__)) print("Licensed under the terms of the " + __license__, end="\n\n") Session.notice_displayed = True - self.is_cdn = is_cdn - self.net_workers = net_workers - self.connection = Connection(DataCenter(dc_id, test_mode), proxy) - self.api_id = api_id + self.is_cdn = is_cdn self.auth_key = auth_key self.auth_key_id = sha1(auth_key).digest()[-8:] @@ -120,7 +116,7 @@ class Session: try: self.connection.connect() - for i in range(self.net_workers): + for i in range(self.NET_WORKERS): Thread(target=self.net_worker, name="NetWorker#{}".format(i + 1)).start() Thread(target=self.recv, name="RecvThread").start() @@ -179,7 +175,7 @@ class Session: self.connection.close() - for i in range(self.net_workers): + for i in range(self.NET_WORKERS): self.recv_queue.put(None) log.debug("Session stopped")