Skip to content

[fix] use thread-local aiohttp.ClientSession, as it is not thread-safe #2565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
utterstep wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] use thread-local aiohttp.ClientSession, as it is not thread-safe #2565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions telebot/asyncio_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import asyncio # for future uses
import ssl
import threading
import aiohttp
import certifi
from telebot import types
Expand Down Expand Up @@ -30,9 +31,16 @@

class SessionManager:
def __init__(self) -> None:
self.session = None
self._local = threading.local()
self.ssl_context = ssl.create_default_context(cafile=certifi.where())

@property
def session(self):
return getattr(self._local, 'session', None)

@session.setter
def session(self, value):
self._local.session = value

async def create_session(self):
self.session = aiohttp.ClientSession(connector=aiohttp.TCPConnector(
Expand All @@ -45,7 +53,7 @@ async def get_session(self):
if self.session is None:
self.session = await self.create_session()
return self.session

if self.session.closed:
self.session = await self.create_session()

Expand Down