diff --git a/requirements.txt b/requirements.txt index a4cdffb..d620384 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,22 +1,24 @@ annotated-types==0.7.0 bidict==0.23.1 blinker==1.8.2 +cffi==1.17.1 click==8.1.8 colorama==0.4.6 dnspython==2.7.0 email_validator==2.2.0 -eventlet==0.33.3 Flask==3.0.3 Flask-Cors==5.0.0 Flask-JWT-Extended==4.7.1 Flask-SocketIO==5.5.1 -greenlet==3.1.1 +gevent==25.5.1 +greenlet==3.2.3 h11==0.14.0 idna==3.10 importlib_metadata==8.5.0 itsdangerous==2.2.0 Jinja2==3.1.5 MarkupSafe==2.1.5 +pycparser==2.22 pydantic==2.10.6 pydantic_core==2.27.2 PyJWT==2.10.1 @@ -29,4 +31,6 @@ six==1.17.0 typing_extensions==4.12.2 Werkzeug==3.0.6 wsproto==1.2.0 -zipp==3.20.2 \ No newline at end of file +zipp==3.20.2 +zope.event==5.1 +zope.interface==7.2 \ No newline at end of file diff --git a/src/app.py b/src/app.py index f1faeda..9fc5591 100644 --- a/src/app.py +++ b/src/app.py @@ -1,22 +1,5 @@ -from eventlet import wsgi -from eventlet.greenio import GreenSocket - -import eventlet -eventlet.monkey_patch() - -# Принудительная инициализация сокетов -import eventlet.hubs -eventlet.hubs.use_hub() - -# Явная проверка -import socket -print(f"Actual socket module: {socket.__name__}") -print(f"Actual socket class: {socket.socket}") - -if not hasattr(socket, '_realsocket'): - print("WARNING: Monkey patching failed!") -else: - print("Monkey patching successful") +from gevent import monkey +monkey.patch_all() from flask_cors import CORS from pymongo import MongoClient @@ -46,17 +29,6 @@ if db is not None: else: print('Failed to connect to MongoDB') -def check_environment(): - import sys - print("=== Environment Check ===") - print(f"Python version: {sys.version}") - print(f"Eventlet version: {eventlet.__version__}") - print(f"GreenSocket available: {'eventlet.greenio.base.GreenSocket' in sys.modules}") - print(f"Patched modules: {[m for m in sys.modules if m.startswith('__patched_module_')]}") - print("========================") - -check_environment() - if __name__ == '__main__': #app.run(debug=True) socketio.run(app, host=Config.APP_HOST, debug=False) diff --git a/src/infra/server.py b/src/infra/server.py index 16a377b..8838373 100644 --- a/src/infra/server.py +++ b/src/infra/server.py @@ -1,8 +1,7 @@ from flask import Flask from flask_socketio import SocketIO from flask_jwt_extended import JWTManager -from eventlet.greenio.base import GreenSocket app = Flask(__name__) -socketio = SocketIO(app, async_mode='eventlet', cors_allowed_origins="*", socket_class=GreenSocket) +socketio = SocketIO(app, async_mode='gevent', cors_allowed_origins="*") jwt = JWTManager(app) \ No newline at end of file