Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2015-11-17 15:10:49 +00:00
parent e503848990 bceec65913
commit 391f2aa56c
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGES.rst
View File

@ -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) Changes in synapse v0.11.0-rc1 (2015-11-11)
=========================================== ===========================================

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.11.0-rc1" __version__ = "0.11.0"

5
synapse/http/matrixfederationclient.py
View File

@ -56,7 +56,7 @@ incoming_responses_counter = metrics.register_counter(
) )
MAX_RETRIES = 4 MAX_RETRIES = 10
class MatrixFederationEndpointFactory(object): class MatrixFederationEndpointFactory(object):
@ -184,7 +184,8 @@ class MatrixFederationHttpClient(object):
) )
if retries_left and not timeout: 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) delay *= random.uniform(0.8, 1.4)
yield sleep(delay) yield sleep(delay)
retries_left -= 1 retries_left -= 1