MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-05 02:38:54 +02:00
Code Issues Projects Releases Wiki Activity
10432 commits 5 branches 704 tags 78 MiB
Commit graph

10432 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston f609acc109 Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse 2018-03-16 00:13:51 +00:00
Erik Johnston 0092cf38ae Newline 2018-03-16 00:11:58 +00:00
Erik Johnston 5b631ff41a Remove wrong comment 2018-03-16 00:07:08 +00:00
Erik Johnston ba48755d56 Bump version and changelog 2018-03-15 23:57:26 +00:00
Erik Johnston 926ba76e23 Replace ujson with simplejson 2018-03-15 23:43:31 +00:00
Erik Johnston 9cf519769b Use .iter* to avoid copies in StateHandler 2018-03-15 17:50:26 +00:00
Erik Johnston 7c7706f42b Fix bug where state cache used lots of memory 
The state cache bases its size on the sum of the size of entries. The
size of the entry is calculated once on insertion, so it is important
that the size of entries does not change.

The DictionaryCache modified the entries size, which caused the state
cache to incorrectly think it was smaller than it actually was.
 2018-03-15 15:46:54 +00:00
NotAFile 2cc9f76bc3 replace old style error catching with 'as' keyword 
This is both easier to read and compatible with python3 (not that that
matters)

Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-03-15 16:11:17 +01:00
Erik Johnston ddb00efc1d Bump version number 2018-03-15 14:41:30 +00:00
Erik Johnston 2a376579f3
Merge pull request #3003 from matrix-org/rav/fix_contributing 
CONTRIBUTING.rst: fix CI info
 2018-03-15 13:31:59 +00:00
Erik Johnston 873aea7168
Merge pull request #3002 from matrix-org/rav/purge_doc 
Update purge_history_api.rst
 2018-03-15 13:31:54 +00:00
Erik Johnston bf7ee93cb6
Merge pull request #2997 from turt2live/patch-2 
Doc: Make the event_creator routes regex a code block
 2018-03-15 13:12:44 +00:00
Richard van der Hoff 5ea624b0f5
CONTRIBUTING.rst: fix CI info 2018-03-15 11:48:35 +00:00
Richard van der Hoff 0ad5125814
Update purge_history_api.rst 
clarify that `purge_history` will not purge state
 2018-03-15 11:05:42 +00:00
Richard van der Hoff 068c21ab10
CHANGES.rst: reword metric deprecation 2018-03-15 10:36:31 +00:00
Neil Johnson b29d1abab6
Update CHANGES.rst 2018-03-15 10:34:15 +00:00
Neil Johnson 7367a4a823
Update CHANGES.rst 2018-03-15 10:33:52 +00:00
Neil Johnson 7d26591048
Update CHANGES.rst 2018-03-15 10:33:24 +00:00
Erik Johnston 2059b8573f
Update CHANGES.rst 2018-03-14 18:11:21 +00:00
Erik Johnston 10fdcf561d
Fix up rst formatting 2018-03-14 17:30:17 +00:00
Neil Johnson 5ccb57d3ff
Update CHANGES.rst 2018-03-14 17:12:58 +00:00
Travis Ralston c33c1ceddd
OCD: Make the event_creator routes regex a code block 
All the others are code blocks, so this one should be to (currently it is a blockquote).

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-03-14 11:09:08 -06:00
Neil Johnson fb647164f2
Update CHANGES.rst 2018-03-14 16:20:36 +00:00
Neil Johnson a492b17fe2
Update CHANGES.rst 
clean formatting
 2018-03-14 16:18:09 +00:00
Neil Johnson cb2c7c0669
Update CHANGES.rst 
WIP, need to add most recent PRs
 2018-03-14 16:09:20 +00:00
Erik Johnston 3959754de3
Merge pull request #2995 from matrix-org/erikj/enable_membership_worker 
Register membership/state servlets in event_creator
 2018-03-14 14:37:33 +00:00
Erik Johnston 4f28018c83 Register membership/state servlets in event_creator 2018-03-14 14:30:06 +00:00
Erik Johnston 57db62e554
Merge pull request #2992 from matrix-org/erikj/implement_member_workre 
Implement RoomMemberWorkerHandler
 2018-03-14 14:29:33 +00:00
Erik Johnston 0011ede3b0 Fix imports 2018-03-14 14:19:23 +00:00
Erik Johnston 62ad701326 s/join/joined/ in notify_user_membership_change 2018-03-14 14:17:43 +00:00
Erik Johnston 3f0f06cb31 Split RoomMemberWorkerHandler to separate file 2018-03-14 11:41:45 +00:00
Erik Johnston 3e839e0548
Merge pull request #2989 from matrix-org/erikj/profile_cache_master 
Only update remote profile cache on master
 2018-03-14 09:42:27 +00:00
Erik Johnston ebd0127999
Merge pull request #2988 from matrix-org/erikj/split_profile_store 
Split up ProfileStore
 2018-03-14 09:41:06 +00:00
Erik Johnston cfe75a9fb6
Merge pull request #2991 from matrix-org/erikj/fixup_rm 
_remote_join and co take a requester
 2018-03-14 09:40:57 +00:00
Erik Johnston f51565e023
Merge pull request #2993 from matrix-org/erikj/is_blocked 
Add is_blocked to worker store
 2018-03-14 09:39:18 +00:00
Matthew Hodgson d144ed6ffb
fix bug #2926 (loading all state for a given type from the DB if the state_key is None) (#2990) 
Fixes a regression that had crept in where the caching layer upholds requests for loading state which is filtered by type (but not by state_key), but the DB layer itself would interpret a missing state_key as a request to filter by null state_key rather than returning all state_keys.
 2018-03-13 22:36:04 +00:00
Erik Johnston a08726fc42 Add is_blocked to worker store 2018-03-13 18:28:44 +00:00
Erik Johnston b27320b550 Implement RoomMemberWorkerHandler 2018-03-13 18:26:00 +00:00
Erik Johnston 350331d466 _remote_join and co take a requester 2018-03-13 17:50:39 +00:00
Erik Johnston 1a69c6d590
Merge pull request #2987 from matrix-org/erikj/split_room_member_handler 
Split RoomMemberHandler into base and master class
 2018-03-13 17:40:00 +00:00
Erik Johnston df8ff682a7 Only update remote profile cache on master 2018-03-13 17:38:21 +00:00
Erik Johnston 3518d0ea8f Split up ProfileStore 2018-03-13 17:36:50 +00:00
Erik Johnston d45a114824 Raise, don't return, exception 2018-03-13 17:24:34 +00:00
Erik Johnston 6dbebef141 Add missing param to docstrings 2018-03-13 17:15:32 +00:00
Erik Johnston 16adb11cc0 Correct import order 2018-03-13 16:57:07 +00:00
Erik Johnston 82f16faa78 Move user_*_room distributor stuff to master class 
I added yields when calling user_left_room, but they shouldn't matter on
the master process as they always return None anyway.
 2018-03-13 16:38:15 +00:00
Erik Johnston b78717b87b Split RoomMemberHandler into base and master class 
The intention here is to split the class into the bits that can be done
on workers and the bits that have to be done on the master.

In future there will also be a class that can be run on the worker,
which will delegate work to the master when necessary.
 2018-03-13 16:37:41 +00:00
Erik Johnston 95cb401ae0
Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer 
Remove ReplicationLayer and user Client/Server directly
 2018-03-13 15:45:08 +00:00
Erik Johnston 5d8476d8ff
Merge pull request #2981 from matrix-org/erikj/factor_remote_leave 
Factor out _remote_reject_invite in RoomMember
 2018-03-13 15:44:56 +00:00
Jonas Platte 47ce527f45 Add room_id to the response of rooms/{roomId}/join 
Fixes #2349
 2018-03-13 14:48:12 +01:00