From 481033af57cb0ac5dd894faf9e5fe3f80a53aba9 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Tue, 10 Aug 2021 21:49:51 +0200
Subject: [PATCH] matrix: Update synapse to 1.40.0

---
 playbooks/matrix.archlinux.org.yml        | 1 -
 roles/matrix/tasks/main.yml               | 2 +-
 roles/matrix/templates/homeserver.yaml.j2 | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/playbooks/matrix.archlinux.org.yml b/playbooks/matrix.archlinux.org.yml
index 3c92d9e01..98a6fc777 100644
--- a/playbooks/matrix.archlinux.org.yml
+++ b/playbooks/matrix.archlinux.org.yml
@@ -18,7 +18,6 @@
       postgres_work_mem: 64MB
       postgres_maintenance_work_mem: 256MB
       postgres_effective_cache_size: 4GB
-      postgres_jit: 'off'
     - { role: postfix_null }
     - { role: matrix }
     - { role: fail2ban }
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index 16f1a1866..1299d0c68 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -77,7 +77,7 @@
 - name: install synapse
   pip:
     name:
-      - 'matrix-synapse[postgres,systemd,url_preview,redis,oidc]==1.39.0'
+      - 'matrix-synapse[postgres,systemd,url_preview,redis,oidc]==1.40.0'
     state: latest
     extra_args: '--upgrade-strategy=eager'
     virtualenv: /var/lib/synapse/venv
diff --git a/roles/matrix/templates/homeserver.yaml.j2 b/roles/matrix/templates/homeserver.yaml.j2
index e5c5acfc7..dec61af1b 100644
--- a/roles/matrix/templates/homeserver.yaml.j2
+++ b/roles/matrix/templates/homeserver.yaml.j2
@@ -731,6 +731,9 @@ caches:
 # 'name' gives the database engine to use: either 'sqlite3' (for SQLite) or
 # 'psycopg2' (for PostgreSQL).
 #
+# 'txn_limit' gives the maximum number of transactions to run per connection
+# before reconnecting. Defaults to 0, which means no limit.
+#
 # 'args' gives options which are passed through to the database engine,
 # except for options starting 'cp_', which are used to configure the Twisted
 # connection pool. For a reference to valid arguments, see:
@@ -751,6 +754,7 @@ caches:
 #
 #database:
 #  name: psycopg2
+#  txn_limit: 10000
 #  args:
 #    user: synapse_user
 #    password: secretpassword
@@ -765,6 +769,7 @@ caches:
 #
 database:
   name: psycopg2
+  txn_limit: 10000
   args:
     dbname: synapse
     user: synapse
-- 
GitLab