mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Use per-thread requests sessions

Browse Source 
Reason is requests.Session is not thread-safe
See: https://github.com/requests/requests/issues/2766
This commit is contained in:
the31k 2017-07-19 01:35:44 +03:00
parent 1a80fc5a0e
commit feec19b7f4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
telebot/apihelper.py
View File

@ -18,7 +18,6 @@ from telebot import types
from telebot import util from telebot import util
logger = telebot.logger logger = telebot.logger
req_session = requests.session()
proxy = None proxy = None
API_URL = "https://api.telegram.org/bot{0}/{1}" API_URL = "https://api.telegram.org/bot{0}/{1}"
@ -28,6 +27,10 @@ CONNECT_TIMEOUT = 3.5
READ_TIMEOUT = 9999 READ_TIMEOUT = 9999
def _get_req_session():
return util.per_thread('req_session', lambda: requests.session())
def _make_request(token, method_name, method='get', params=None, files=None, base_url=API_URL): def _make_request(token, method_name, method='get', params=None, files=None, base_url=API_URL):
""" """
Makes a request to the Telegram API. Makes a request to the Telegram API.
@ -47,8 +50,8 @@ def _make_request(token, method_name, method='get', params=None, files=None, bas
if params: if params:
if 'timeout' in params: read_timeout = params['timeout'] + 10 if 'timeout' in params: read_timeout = params['timeout'] + 10
if 'connect-timeout' in params: connect_timeout = params['connect-timeout'] + 10 if 'connect-timeout' in params: connect_timeout = params['connect-timeout'] + 10
result = req_session.request(method, request_url, params=params, files=files, result = _get_req_session().req_session.request(method, request_url, params=params, files=files,
timeout=(connect_timeout, read_timeout), proxies=proxy) timeout=(connect_timeout, read_timeout), proxies=proxy)
logger.debug("The server returned: '{0}'".format(result.text.encode('utf8'))) logger.debug("The server returned: '{0}'".format(result.text.encode('utf8')))
return _check_result(method_name, result)['result'] return _check_result(method_name, result)['result']
@ -97,7 +100,7 @@ def get_file(token, file_id):
def download_file(token, file_path): def download_file(token, file_path):
url = FILE_URL.format(token, file_path) url = FILE_URL.format(token, file_path)
result = req_session.get(url) result = _get_req_session().get(url)
if result.status_code != 200: if result.status_code != 200:
msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \ msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \
.format(result.status_code, result.reason, result.text) .format(result.status_code, result.reason, result.text)