Set response values to zero if None for /_synapse/admin/v1/federation…

…/destinations (matrix-org#16729)
OctAg0nO · Dec 5, 2023 · ea78355 · ea78355
1 parent 0bb8e41
commit ea78355
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/16729.bugfix b/changelog.d/16729.bugfix
@@ -0,0 +1 @@
+Fix GET /_synapse/admin/v1/federation/destinations returning null (instead of 0) for `retry_last_ts` and `retry_interval`.
diff --git a/synapse/rest/admin/federation.py b/synapse/rest/admin/federation.py
@@ -89,8 +89,8 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
             "destinations": [
                 {
                     "destination": r[0],
-                    "retry_last_ts": r[1],
-                    "retry_interval": r[2],
+                    "retry_last_ts": r[1] or 0,
+                    "retry_interval": r[2] or 0,
                     "failure_ts": r[3],
                     "last_successful_stream_ordering": r[4],
                 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix GET /_synapse/admin/v1/federation/destinations returning null (instead of 0) for `retry_last_ts` and `retry_interval`.