diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-17 15:10:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-17 15:10:49 +0000 |
| commit | 391f2aa56c54cee6001de415ae4609e15702629c (patch) | |
| tree | 4377eb0dc5e221862489bdcc802e50e2f1f41cb1 | |
| parent | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver (diff) | |
| parent | Slightly more aggressive retry timers at HTTP level (diff) | |
| download | synapse-391f2aa56c54cee6001de415ae4609e15702629c.tar.xz | |
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 13 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index cf5e33c4f9..068ed9f2ff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,16 @@ +Changes in synapse v0.11.0 (2015-11-17) +======================================= + +* Change CAS login API (PR #349) + +Changes in synapse v0.11.0-rc2 (2015-11-13) +=========================================== + +* Various changes to /sync API response format (PR #373) +* Fix regression when setting display name in newly joined room over + federation (PR #368) +* Fix problem where /search was slow when using SQLite (PR #366) + Changes in synapse v0.11.0-rc1 (2015-11-11) =========================================== diff --git a/synapse/__init__.py b/synapse/__init__.py index f68a15bb85..f0eac97bab 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.11.0-rc1" +__version__ = "0.11.0" diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 6e53538a52..ca9591556d 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -56,7 +56,7 @@ incoming_responses_counter = metrics.register_counter( ) -MAX_RETRIES = 4 +MAX_RETRIES = 10 class MatrixFederationEndpointFactory(object): @@ -184,7 +184,8 @@ class MatrixFederationHttpClient(object): ) if retries_left and not timeout: - delay = 5 ** (MAX_RETRIES + 1 - retries_left) + delay = 4 ** (MAX_RETRIES + 1 - retries_left) + delay = max(delay, 60) delay *= random.uniform(0.8, 1.4) yield sleep(delay) retries_left -= 1 |