OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity
10,429 Commits
842 Branches
671 Tags
284 MiB
Commit Graph

10429 Commits (89de9349815b79f55bfff53b7c8c6d43f8c30336)

Author SHA1 Message Date
Vincent Breitmoser 89de934981 Use psycopg2cffi module instead of psycopg2 if running on pypy 
The psycopg2 package isn't available for PyPy.  This commit adds a check
if the runtime is PyPy, and if it is uses psycopg2cffi module in favor
of psycopg2. This is almost a drop-in replacement, except for one place
where an additional cast to string is required.
 2018-04-10 11:29:52 +02:00
Vincent Breitmoser 9fbe70a7dc Use sortedcontainers instead of blist 
This commit drop-in replaces blist with SortedContainers. They are
written in pure python so work with pypy, but perform as good as
native implementations, at least in a couple benchmarks:

http://www.grantjenks.com/docs/sortedcontainers/performance.html
 2018-04-10 11:29:51 +02:00
Richard van der Hoff a3599dda97
Merge pull request #2996 from krombel/allow_auto_join_rooms 
move handling of auto_join_rooms to RegisterHandler
 2018-04-10 01:11:00 +01:00
Richard van der Hoff 87478c5a60
Merge pull request #3061 from NotAFile/add-some-byte-strings 
Add b prefixes to some strings that are bytes in py3
 2018-04-09 23:54:05 +01:00
Richard van der Hoff c508b2f2f0
Merge pull request #3073 from NotAFile/use-six-reraise 
Replace old-style raise with six.reraise
 2018-04-09 23:53:40 +01:00
Richard van der Hoff 37354b55c9
Merge pull request #2938 from dklug/develop 
Return 401 for invalid access_token on logout
 2018-04-09 23:52:56 +01:00
Richard van der Hoff 0e9aa1d091
Merge pull request #3074 from NotAFile/fix-py3-prints 
use python3-compatible prints
 2018-04-09 23:44:41 +01:00
Richard van der Hoff 8eaa141d8f
Merge pull request #3075 from NotAFile/six-type-checks 
Replace some type checks with six type checks
 2018-04-09 23:40:44 +01:00
Richard van der Hoff 664adb4236
Merge pull request #3016 from silkeh/improve-service-lookups 
Improve handling of SRV records for federation connections
 2018-04-09 23:40:06 +01:00
Richard van der Hoff aea3a93611
Merge pull request #3069 from krombel/update_prometheus_config 
update prometheus dashboard to use new metric names
 2018-04-09 23:37:18 +01:00
Richard van der Hoff d2c6f4d626
Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin 
Return a 404 rather than a 500 on rejoining empty rooms
 2018-04-09 17:32:36 +01:00
Richard van der Hoff 13decdbf96 Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics" 
We aren't ready to release this yet, so I'm reverting it for now.

This reverts commit d1679a4ed7, reversing
changes made to e089100c62.
 2018-04-09 12:59:12 +01:00
Richard van der Hoff f3ef60662f Return a 404 rather than a 500 on rejoining empty rooms 
Filter ourselves out of the server list before checking for an empty remote
host list, to fix 500 error

Fixes #2141
 2018-04-09 12:56:22 +01:00
Adrian Tschira e54c202b81 Replace some type checks with six type checks 
Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-04-07 01:02:32 +02:00
Adrian Tschira b0500d3774 use python3-compatible prints 2018-04-06 23:35:27 +02:00
Adrian Tschira 4f40d058cc Replace old-style raise with six.reraise 
The old style raise is invalid syntax in python3. As noted in the docs,
this adds one more frame in the traceback, but I think this is
acceptable:

    <ipython-input-7-bcc5cba3de3f> in <module>()
         16     except:
         17         pass
    ---> 18     six.reraise(*x)

    /usr/lib/python3.6/site-packages/six.py in reraise(tp, value, tb)
        691             if value.__traceback__ is not tb:
        692                 raise value.with_traceback(tb)
    --> 693             raise value
        694         finally:
        695             value = None

    <ipython-input-7-bcc5cba3de3f> in <module>()
          9
         10 try:
    ---> 11     x()
         12 except:
         13     x = sys.exc_info()

Also note that this uses six, which is not formally a dependency yet,
but is included indirectly since most packages depend on it.

Signed-off-by: Adrian Tschira <nota@notafile.com>
 2018-04-06 23:06:24 +02:00
Luke Barnard 135fc5b9cd
Merge pull request #3046 from matrix-org/dbkr/join_group 
Implement group join API
 2018-04-06 16:24:32 +01:00
Luke Barnard 020a501354 de-lint, quote consistency 2018-04-06 16:02:06 +01:00
Luke Barnard db2fd801f7 Explicitly grab individual columns from group object 2018-04-06 15:57:25 +01:00
Erik Johnston e8b03cab1b
Merge pull request #3071 from matrix-org/erikj/resp_size_metrics 
Add response size metrics
 2018-04-06 15:49:12 +01:00
Richard van der Hoff 8844f95c32
Merge pull request #3072 from matrix-org/rav/fix_port_script 
postgres port script: fix state_groups_pkey error
 2018-04-06 15:47:40 +01:00
Luke Barnard 7945435587 When exposing group state, return is_openly_joinable 
as opposed to join_policy, which is really only pertinent to the
synapse implementation of the group server.

By doing this we keep the group server concept extensible by
allowing arbitrarily complex rules for deciding whether a group
is openly joinable.
 2018-04-06 15:43:27 +01:00
Luke Barnard 6bd1b7053e By default, join policy is "invite" 2018-04-06 15:43:27 +01:00
Luke Barnard b4478e586f add_user -> _add_user 2018-04-06 15:43:27 +01:00
Luke Barnard 112c2253e2 pep8 2018-04-06 15:43:27 +01:00
Luke Barnard 6850f8aea3 Get group_info from existing call to check_group_is_ours 2018-04-06 15:43:27 +01:00
Luke Barnard cd087a265d Don't use redundant inlineCallbacks 2018-04-06 15:43:27 +01:00
Luke Barnard 87c864b698 join_rule -> join_policy 2018-04-06 15:43:27 +01:00
Luke Barnard ae85c7804e is_joinable -> join_rule 2018-04-06 15:43:27 +01:00
Luke Barnard f8d1917fce Fix federation client `set_group_joinable` typo 2018-04-06 15:43:27 +01:00
Luke Barnard 6eb3aa94b6 Factor out add_user from accept_invite and join_group 2018-04-06 15:43:27 +01:00
David Baker edb45aae38 pep8 2018-04-06 15:43:27 +01:00
David Baker b370fe61c0 Implement group join API 2018-04-06 15:43:27 +01:00
Richard van der Hoff 6a9777ba02 Port script: Set up state_group_id_seq 
Fixes https://github.com/matrix-org/synapse/issues/3050.
 2018-04-06 15:33:30 +01:00
Richard van der Hoff 01579384cc Port script: clean up a bit 
Improve logging and comments. Group all the stuff to do with inspecting tables
together rather than creating the port tables in the middle.
 2018-04-06 15:33:30 +01:00
Richard van der Hoff e01ba5bda3 Port script: avoid nasty errors when setting up 
We really shouldn't spit out "Failed to create port table", it looks scary.
 2018-04-06 15:33:30 +01:00
Erik Johnston 7b824f1475 Add response size metrics 2018-04-06 13:20:11 +01:00
Erik Johnston 35ff941172
Merge pull request #3070 from krombel/group_join_put_instead_post 
use PUT instead of POST for federating groups/m.join_policy
 2018-04-06 12:11:16 +01:00
Krombel 1d71f484d4 use PUT instead of POST for federating groups/m.join_policy 2018-04-06 12:54:09 +02:00
Richard van der Hoff 15e8ed874f more verbosity in synctl 2018-04-06 09:28:36 +01:00
Krombel c7ede92d0b make prometheus config compliant to v0.28 2018-04-05 23:34:01 +02:00
Richard van der Hoff 551422051b
Merge pull request #2886 from turt2live/travis/new-worker-docs 
Add a blurb explaining the main synapse worker
 2018-04-05 17:33:09 +01:00
Richard van der Hoff c7f0969731
Merge pull request #2986 from jplatte/join_reponse_room_id 
Add room_id to the response of `rooms/{roomId}/join`
 2018-04-05 17:29:06 +01:00
Richard van der Hoff 3449da3bc7
Merge pull request #3068 from matrix-org/rav/fix_cache_invalidation 
Improve database cache performance
 2018-04-05 17:21:44 +01:00
Richard van der Hoff d1679a4ed7
Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics 
Remove redundant metrics which were deprecated in 0.27.0.
 2018-04-05 17:21:18 +01:00
Richard van der Hoff 01afc563c3 Fix overzealous cache invalidation 
Fixes an issue where a cache invalidation would invalidate *all* pending
entries, rather than just the entry that we intended to invalidate.
 2018-04-05 16:24:04 +01:00
Luke Barnard e089100c62
Merge pull request #3045 from matrix-org/dbkr/group_joinable 
Add joinability for groups
 2018-04-05 15:57:49 +01:00
Neil Johnson 68b0ee4e8d
Merge pull request #3041 from matrix-org/r30_stats 
R30 stats
 2018-04-05 15:37:37 +01:00
Richard van der Hoff 22284a6f65
Merge pull request #3060 from matrix-org/rav/kill_event_content 
Remove uses of events.content
 2018-04-05 15:02:17 +01:00
Luke Barnard 917380e89d NON NULL -> NOT NULL 2018-04-05 14:32:12 +01:00