Skip to content

Commit 3608c2b

Browse files
committed
dispatcher: if connection pool is already initialized raise exception
this will better protect the user from wrong usage
1 parent c28763c commit 3608c2b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

telegram/ext/dispatcher.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
from time import sleep
2525
from queue import Queue, Empty
2626

27+
from future.builtins import range
28+
2729
from telegram import (TelegramError, NullHandler)
2830
from telegram.utils import request
2931
from telegram.ext.handler import Handler
@@ -109,8 +111,9 @@ def __init__(self, bot, update_queue, workers=4, exception_event=None):
109111
self.__exception_event = exception_event or Event()
110112

111113
if not len(ASYNC_THREADS):
112-
if request._CON_POOL:
113-
self.logger.warning("Connection Pool already initialized!")
114+
if request.is_con_pool_initialized():
115+
raise RuntimeError('Connection Pool already initialized')
116+
114117
request.CON_POOL_SIZE = workers + 3
115118
for i in range(workers):
116119
thread = Thread(target=_pooled, name=str(i))

telegram/utils/request.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ def _get_con_pool():
4747
])
4848
return _CON_POOL
4949

50+
def is_con_pool_initialized():
51+
return _CON_POOL is not None
52+
5053

5154
def _parse(json_data):
5255
"""Try and parse the JSON returned from Telegram.

0 commit comments

Comments
 (0)