lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2026-09-24 06:15:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gevent/thread type cleanups

Browse Source
This commit is contained in:
dgtlmoon
2025-06-02 18:32:10 +02:00
parent 6866956e67
commit cd7dde4477
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changedetectionio/realtime/socket_server.py
+14 -14
View File
@@ -220,27 +220,27 @@ def init_socketio(app, datastore):
system = platform.system().lower()
python_version = sys.version_info
# Check for manual override via environment variable
force_threading = strtobool(os.getenv('SOCKETIO_FORCE_THREADING', 'False'))
force_gevent = strtobool(os.getenv('SOCKETIO_FORCE_GEVENT', 'False'))
# Check for SocketIO mode configuration via environment variable
# Default is 'threading' for best cross-platform compatibility
socketio_mode = os.getenv('SOCKETIO_MODE', 'threading').lower()
if force_threading:
# Manual override to threading mode
async_mode = 'threading'
logger.info(f"SOCKETIO_FORCE_THREADING=True: Using {async_mode} mode for Socket.IO (manual override)")
elif force_gevent:
# Manual override to gevent mode for testing
if socketio_mode == 'gevent':
# Use gevent mode (higher concurrency but platform limitations)
try:
import gevent
async_mode = 'gevent'
logger.info(f"SOCKETIO_FORCE_GEVENT=True: Using {async_mode} mode for Socket.IO (manual override)")
logger.info(f"SOCKETIO_MODE=gevent: Using {async_mode} mode for Socket.IO")
except ImportError:
async_mode = 'threading'
logger.warning(f"SOCKETIO_FORCE_GEVENT=True but gevent not available, falling back to {async_mode} mode")
else:
# Use threading mode for all platforms - simpler, more reliable, and future-proof
logger.warning(f"SOCKETIO_MODE=gevent but gevent not available, falling back to {async_mode} mode")
elif socketio_mode == 'threading':
# Use threading mode (default - best compatibility)
async_mode = 'threading'
logger.info(f"Platform: {system}, Python: {python_version.major}.{python_version.minor} - Using {async_mode} mode for Socket.IO")
logger.info(f"SOCKETIO_MODE=threading: Using {async_mode} mode for Socket.IO")
else:
# Invalid mode specified, use default
async_mode = 'threading'
logger.warning(f"Invalid SOCKETIO_MODE='{socketio_mode}', using default {async_mode} mode for Socket.IO")
# Log platform info for debugging
logger.info(f"Platform: {system}, Python: {python_version.major}.{python_version.minor}, Socket.IO mode: {async_mode}")
requirements.txt
+3 -1
View File
@@ -100,7 +100,9 @@ levenshtein
# Needed for > 3.10, https://github.com/microsoft/playwright-python/issues/2096
greenlet >= 3.0.3
# Used for realtime socketio mode (so its a different driver to eventlet/threading not to interfere with playwright)
# Optional: Used for high-concurrency SocketIO mode (via SOCKETIO_MODE=gevent)
# Note: gevent has cross-platform limitations (Windows 1024 socket limit, macOS ARM build issues)
# Default SOCKETIO_MODE=threading is recommended for better compatibility
gevent
# Pinned or it causes problems with flask_expects_json which seems unmaintained