mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-21 17:15:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add application_names to the postgres connections based on the worker names

Browse source
This commit is contained in:
Olivier 'reivilibre 2024-09-09 16:15:52 +01:00
parent 1e73e7dde2
commit b21487300c
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
docker/conf-workers/worker.yaml.j2
View file

@ -27,4 +27,19 @@ worker_listeners:
worker_log_config: {{ worker_log_config_filepath }} worker_log_config: {{ worker_log_config_filepath }}
database:
name: "psycopg2"
args:
user: "{{ POSTGRES_USER or "synapse" }}"
password: "{{ POSTGRES_PASSWORD }}"
database: "{{ POSTGRES_DB or "synapse" }}"
{% if not SYNAPSE_USE_UNIX_SOCKET %}
{# Synapse will use a default unix socket for Postgres when host/port is not specified (behavior from `psycopg2`). #}
host: "{{ POSTGRES_HOST or "db" }}"
port: "{{ POSTGRES_PORT or "5432" }}"
{% endif %}
cp_min: {{ POSTGRES_CP_MIN or 5 }}
cp_max: {{ POSTGRES_CP_MAX or 10 }}
application_name: "{{ name }}"
{{ worker_extra_conf }} {{ worker_extra_conf }}

1
docker/conf/homeserver.yaml
View file

@ -69,6 +69,7 @@ database:
{% endif %} {% endif %}
cp_min: {{ POSTGRES_CP_MIN or 5 }} cp_min: {{ POSTGRES_CP_MIN or 5 }}
cp_max: {{ POSTGRES_CP_MAX or 10 }} cp_max: {{ POSTGRES_CP_MAX or 10 }}
application_name: synapse
{% else %} {% else %}
database: database:
name: "sqlite3" name: "sqlite3"

6
docker/configure_workers_and_start.py
View file

@ -962,11 +962,17 @@ def generate_worker_files(
environ, worker_name, workers_config_dir, template_dir, data_dir environ, worker_name, workers_config_dir, template_dir, data_dir
) )
extra_env: Dict[str, str] = {}
for extra_env_var in ("POSTGRES_HOST", "POSTGRES_PORT", "POSTGRES_USER", "POSTGRES_PASSWORD", "POSTGRES_SOCKET", "POSTGRES_DB", "SYNAPSE_USE_UNIX_SOCKET", "POSTGRES_CP_MIN", "POSTGRES_CP_MAX"):
if extra_env_var in os.environ:
extra_env[extra_env_var] = os.environ[extra_env_var]
# Then a worker config file # Then a worker config file
convert( convert(
os.path.join(template_dir, "worker.yaml.j2"), os.path.join(template_dir, "worker.yaml.j2"),
os.path.join(workers_config_dir, f"{worker_name}.yaml"), os.path.join(workers_config_dir, f"{worker_name}.yaml"),
**worker_config, **worker_config,
**extra_env,
worker_log_config_filepath=log_config_filepath, worker_log_config_filepath=log_config_filepath,
using_unix_sockets=using_unix_sockets, using_unix_sockets=using_unix_sockets,
) )