MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-18 17:33:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release-v0.12.0' into develop

Browse source
This commit is contained in:
Mark Haines 2015-12-16 11:18:45 +00:00
commit 4fab578b43
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CHANGES.rst
View file

@ -1,3 +1,14 @@
Changes in synapse v0.12.0-rc2 (2015-12-14)
===========================================
* Add caches for whether rooms have been forgotten by a user (PR #434)
* Remove instructions to use ``--process-dependency-link`` since all of the
dependencies of synapse are on PyPI (PR #436)
* Parallelise the processing of ``/sync`` requests (PR #437)
* Fix race updating presence in ``/events`` (PR #444)
* Fix bug back-populating search results (PR #441)
* Fix bug calculating state in ``/sync`` requests (PR #442)
Changes in synapse v0.12.0-rc1 (2015-12-10) Changes in synapse v0.12.0-rc1 (2015-12-10)
=========================================== ===========================================

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.12.0-rc1" __version__ = "0.12.0-rc2"

11
synapse/handlers/events.py
View file

@ -69,7 +69,12 @@ class EventStreamHandler(BaseHandler):
A deferred that completes once their presence has been updated. A deferred that completes once their presence has been updated.
""" """
if user not in self._streams_per_user: if user not in self._streams_per_user:
self._streams_per_user[user] = 0 # Make sure we set the streams per user to 1 here rather than
# setting it to zero and incrementing the value below.
# Otherwise this may race with stopped_stream causing the
# user to be erased from the map before we have a chance
# to increment it.
self._streams_per_user[user] = 1
if user in self._stop_timer_per_user: if user in self._stop_timer_per_user:
try: try:
self.clock.cancel_call_later( self.clock.cancel_call_later(
@ -79,8 +84,8 @@ class EventStreamHandler(BaseHandler):
logger.exception("Failed to cancel event timer") logger.exception("Failed to cancel event timer")
else: else:
yield started_user_eventstream(self.distributor, user) yield started_user_eventstream(self.distributor, user)
else:
self._streams_per_user[user] += 1 self._streams_per_user[user] += 1
def stopped_stream(self, user): def stopped_stream(self, user):
"""If there are no streams for a user this starts a timer that will """If there are no streams for a user this starts a timer that will

2
synapse/storage/registration.py
View file

@ -258,10 +258,10 @@ class RegistrationStore(SQLBaseStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def user_add_threepid(self, user_id, medium, address, validated_at, added_at): def user_add_threepid(self, user_id, medium, address, validated_at, added_at):
yield self._simple_upsert("user_threepids", { yield self._simple_upsert("user_threepids", {
"user_id": user_id,
"medium": medium, "medium": medium,
"address": address, "address": address,
}, { }, {
"user_id": user_id,
"validated_at": validated_at, "validated_at": validated_at,
"added_at": added_at, "added_at": added_at,
}) })