Set response values to zero if None for /_synapse/admin/v1/federation/destinations (#16729)

Half-Shot · web-flow · commit ea783550bb80 · 2023-12-05T11:40:27.000Z
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 @@`
	`1`	+Fix GET /_synapse/admin/v1/federation/destinations returning null (instead of 0) for `retry_last_ts` and `retry_interval`.
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,8 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:`
`89`	`89`	`"destinations": [`
`90`	`90`	`{`
`91`	`91`	`"destination": r[0],`
`92`		`- "retry_last_ts": r[1],`
`93`		`- "retry_interval": r[2],`
	`92`	`+ "retry_last_ts": r[1] or 0,`
	`93`	`+ "retry_interval": r[2] or 0,`
`94`	`94`	`"failure_ts": r[3],`
`95`	`95`	`"last_successful_stream_ordering": r[4],`
`96`	`96`	`}`