Pārlūkot izejas kodu

Parse SYNAPSE_ASYNC_IO_REACTOR env variable & log the reactor on startup (#14092)

tags/v1.70.0rc1
Quentin Gliech pirms 1 gada
committed by GitHub
vecāks
revīzija
dc37b68a25
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: 4AEE18F83AFDEB23
3 mainītis faili ar 16 papildinājumiem un 14 dzēšanām
  1. +1
    -0
      changelog.d/14092.misc
  2. +12
    -14
      synapse/__init__.py
  3. +3
    -0
      synapse/config/logger.py

+ 1
- 0
changelog.d/14092.misc Parādīt failu

@@ -0,0 +1 @@
Run the integration test suites with the asyncio reactor enabled in CI.

+ 12
- 14
synapse/__init__.py Parādīt failu

@@ -21,6 +21,7 @@ import os
import sys

from synapse.util.rust import check_rust_lib_up_to_date
from synapse.util.stringutils import strtobool

# Check that we're not running on an unsupported Python version.
if sys.version_info < (3, 7):
@@ -28,25 +29,22 @@ if sys.version_info < (3, 7):
sys.exit(1)

# Allow using the asyncio reactor via env var.
if bool(os.environ.get("SYNAPSE_ASYNC_IO_REACTOR", False)):
try:
from incremental import Version
if strtobool(os.environ.get("SYNAPSE_ASYNC_IO_REACTOR", "0")):
from incremental import Version

import twisted
import twisted

# We need a bugfix that is included in Twisted 21.2.0:
# https://twistedmatrix.com/trac/ticket/9787
if twisted.version < Version("Twisted", 21, 2, 0):
print("Using asyncio reactor requires Twisted>=21.2.0")
sys.exit(1)
# We need a bugfix that is included in Twisted 21.2.0:
# https://twistedmatrix.com/trac/ticket/9787
if twisted.version < Version("Twisted", 21, 2, 0):
print("Using asyncio reactor requires Twisted>=21.2.0")
sys.exit(1)

import asyncio
import asyncio

from twisted.internet import asyncioreactor
from twisted.internet import asyncioreactor

asyncioreactor.install(asyncio.get_event_loop())
except ImportError:
pass
asyncioreactor.install(asyncio.get_event_loop())

# Twisted and canonicaljson will fail to import when this file is executed to
# get the __version__ during a fresh install. That's OK and subsequent calls to


+ 3
- 0
synapse/config/logger.py Parādīt failu

@@ -326,6 +326,8 @@ def setup_logging(
logBeginner: The Twisted logBeginner to use.

"""
from twisted.internet import reactor

log_config_path = (
config.worker.worker_log_config
if use_worker_options
@@ -348,3 +350,4 @@ def setup_logging(
)
logging.info("Server hostname: %s", config.server.server_name)
logging.info("Instance name: %s", hs.get_instance_name())
logging.info("Twisted reactor: %s", type(reactor).__name__)

Notiek ielāde…
Atcelt
Saglabāt