TeamPGM/pyrogram
2
0
Fork 0
mirror of https://github.com/TeamPGM/pyrogram.git synced 2024-11-18 13:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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,
then gently stop the Client by closing the underlying connection.
@ -275,6 +275,7 @@ class Client(Methods, BaseClient):
Defaults to (SIGINT, SIGTERM, SIGABRT).
"""
def signal_handler(*args):
log.info("Stop signal received ({}). Exiting...".format(args[0]))
self.is_idle = False
for s in stop_signals:
@ -283,9 +284,9 @@ class Client(Methods, BaseClient):
self.is_idle = True
while self.is_idle:
time.sleep(1)
await asyncio.sleep(1)
self.stop()
await self.stop()
def run(self):
"""Use this method to automatically start and idle a Client.
@ -800,29 +801,6 @@ class Client(Methods, BaseClient):
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):
"""Use this method to send Raw Function queries.