yasirarism/pyrofork
1
0
Fork 0
mirror of https://github.com/Mayuri-Chan/pyrofork.git synced 2026-01-05 23:04:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge mess with duplicated idle() methods

Browse source
This commit is contained in:
Dan 2018-06-23 15:49:56 +02:00
parent 518d33ee7a
commit c9cd79cb05
1 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pyrogram/client/client.py
View file

@ -265,7 +265,7 @@ class Client(Methods, BaseClient):
self.is_started = False self.is_started = False
await self.session.stop() await self.session.stop()
def idle(self, stop_signals: tuple = (SIGINT, SIGTERM, SIGABRT)): async def idle(self, stop_signals: tuple = (SIGINT, SIGTERM, SIGABRT)):
"""Blocks the program execution until one of the signals are received, """Blocks the program execution until one of the signals are received,
then gently stop the Client by closing the underlying connection. then gently stop the Client by closing the underlying connection.
@ -275,6 +275,7 @@ class Client(Methods, BaseClient):
Defaults to (SIGINT, SIGTERM, SIGABRT). Defaults to (SIGINT, SIGTERM, SIGABRT).
""" """
def signal_handler(*args): def signal_handler(*args):
log.info("Stop signal received ({}). Exiting...".format(args[0]))
self.is_idle = False self.is_idle = False
for s in stop_signals: for s in stop_signals:
@ -283,9 +284,9 @@ class Client(Methods, BaseClient):
self.is_idle = True self.is_idle = True
while self.is_idle: while self.is_idle:
time.sleep(1) await asyncio.sleep(1)
self.stop() await self.stop()
def run(self): def run(self):
"""Use this method to automatically start and idle a Client. """Use this method to automatically start and idle a Client.
@ -800,29 +801,6 @@ class Client(Methods, BaseClient):
log.info("UpdatesWorkerTask stopped") log.info("UpdatesWorkerTask stopped")
def signal_handler(self, *args):
log.info("Stop signal received ({}). Exiting...".format(args[0]))
self.is_idle = False
async def idle(self, stop_signals: tuple = (SIGINT, SIGTERM, SIGABRT)):
"""Blocks the program execution until one of the signals are received,
then gently stop the Client by closing the underlying connection.
Args:
stop_signals (``tuple``, *optional*):
Iterable containing signals the signal handler will listen to.
Defaults to (SIGINT, SIGTERM, SIGABRT).
"""
for s in stop_signals:
signal(s, self.signal_handler)
self.is_idle = True
while self.is_idle:
await asyncio.sleep(1)
await self.stop()
async def send(self, data: Object): async def send(self, data: Object):
"""Use this method to send Raw Function queries. """Use this method to send Raw Function queries.