From 1b63ccd8483e99aa7ea72b91f99f4cd94ded2e36 Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <olivier@librepush.net>
Date: Wed, 14 Aug 2019 14:05:50 +0100
Subject: Wrap `get_local_public_room_list` call in `maybeDeferred` because it
is cached and so does not always return a `Deferred`. `await` does not
silently pass-through non-Deferreds like `yield` used to.
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
---
synapse/federation/transport/server.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'synapse')
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index ea4e1b6d0f..9a86bd0263 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -19,6 +19,8 @@ import functools
import logging
import re
+from twisted.internet.defer import maybeDeferred
+
import synapse
import synapse.logging.opentracing as opentracing
from synapse.api.errors import Codes, FederationDeniedError, SynapseError
@@ -745,8 +747,12 @@ class PublicRoomList(BaseFederationServlet):
else:
network_tuple = ThirdPartyInstanceID(None, None)
- data = await self.handler.get_local_public_room_list(
- limit, since_token, network_tuple=network_tuple, from_federation=True
+ data = await maybeDeferred(
+ self.handler.get_local_public_room_list,
+ limit,
+ since_token,
+ network_tuple=network_tuple,
+ from_federation=True,
)
return 200, data
--
cgit 1.5.1
From fb5acd703973249063f2a78266eed65c8dfaaf84 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Thu, 15 Aug 2019 12:05:24 +0100
Subject: 1.3.0
---
CHANGES.md | 10 ++++++++++
changelog.d/5766.misc | 1 -
changelog.d/5851.bugfix | 2 --
debian/changelog | 5 +++--
synapse/__init__.py | 2 +-
5 files changed, 14 insertions(+), 6 deletions(-)
delete mode 100644 changelog.d/5766.misc
delete mode 100644 changelog.d/5851.bugfix
(limited to 'synapse')
diff --git a/CHANGES.md b/CHANGES.md
index eca9c82f55..d13dcb717e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.3.0 (2019-08-15)
+==========================
+
+Bugfixes
+--------
+
+- Fix 500 Internal Server Error on `publicRooms` when the public room list was
+ cached. ([\#5851](https://github.com/matrix-org/synapse/issues/5851))
+
+
Synapse 1.3.0rc1 (2019-08-13)
==========================
diff --git a/changelog.d/5766.misc b/changelog.d/5766.misc
deleted file mode 100644
index 163ca2f0d4..0000000000
--- a/changelog.d/5766.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove libsqlite3-dev from required build dependencies.
diff --git a/changelog.d/5851.bugfix b/changelog.d/5851.bugfix
deleted file mode 100644
index 58f7c0c1b8..0000000000
--- a/changelog.d/5851.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix 500 Internal Server Error on `publicRooms` when the public room list was
-cached.
diff --git a/debian/changelog b/debian/changelog
index 55c28be853..83232a0bad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-matrix-synapse-py3 (1.3.0) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.3.0) stable; urgency=medium
[ Andrew Morgan ]
* Remove libsqlite3-dev from required build dependencies.
@@ -13,8 +13,9 @@ matrix-synapse-py3 (1.2.0) stable; urgency=medium
[ Synapse Packaging team ]
* New synapse release 1.2.0.
+ * New synapse release 1.3.0.
- -- Synapse Packaging team <packages@matrix.org> Thu, 25 Jul 2019 14:10:07 +0100
+ -- Synapse Packaging team <packages@matrix.org> Thu, 15 Aug 2019 12:04:23 +0100
matrix-synapse-py3 (1.1.0) stable; urgency=medium
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d2316c7df9..02ae90b072 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
except ImportError:
pass
-__version__ = "1.3.0rc1"
+__version__ = "1.3.0"
--
cgit 1.5.1