b102e93571
Merge branch 'release-v0.25.1'
2017-11-17 12:03:07 +00:00
cdf6fc15b0
Merge pull request #2686 from matrix-org/luke/as-flair
...
Add automagical AS Publicised Group(s)
2017-11-17 10:13:46 +00:00
74bbeb4373
Bump version in __init__.py
2017-11-17 10:10:53 +00:00
2187724ad2
Prep changelog for v0.25.1
2017-11-17 10:09:16 +00:00
eded7084d2
Fix auth handler #2678
2017-11-17 10:07:27 +00:00
34c3d0a386
typo
2017-11-17 01:54:02 +00:00
9d50b6f0ea
quick and dirty room membership<->group membership sync script
2017-11-17 01:54:02 +00:00
ab1dc84779
Add extra space before inline comment
2017-11-16 18:22:40 +00:00
7fb0e98b03
Extract group_id from the dict for multiple use
2017-11-16 18:18:30 +00:00
e836bdf734
Fix tests
2017-11-16 18:14:39 +00:00
c46139a17e
Avoid locking account_data tables for upserts
2017-11-16 18:08:01 +00:00
d8391f0541
Remove unused GROUP_ID_REGEX
2017-11-16 18:05:57 +00:00
4e8374856d
Document get_groups_for_user
2017-11-16 18:03:46 +00:00
270f9cd23a
Flake8
2017-11-16 18:03:31 +00:00
9d83d52027
Use a generator instead of a list
2017-11-16 17:57:34 +00:00
5b48eec4a1
Make sure we check AS groups for lookup on bulk
2017-11-16 17:55:15 +00:00
b1edf26051
Check group_id belongs to this domain
2017-11-16 17:54:27 +00:00
06e5bcfc83
Avoid locking for upsert on pushers tables
...
* replace the upsert into deleted_pushers with an insert
* no need to lock for upsert on pusher_throttle
2017-11-16 17:52:23 +00:00
624a8bbd67
Fix auth handler #2678
2017-11-16 17:19:02 +00:00
b26cbbb60e
Revert "Merge pull request #2679 from jkolo/fix_auth_handler"
...
This PR was against master, not develop :(
This reverts commit 203058a027552f123bea
2017-11-16 17:18:11 +00:00
203058a027
Merge pull request #2679 from jkolo/fix_auth_handler
...
Fix auth handler
2017-11-16 17:09:00 +00:00
97bd18af4e
Add automagical AS Publicised Group(s)
...
via registration file "users" namespace:
```YAML
...
namespaces:
users:
- exclusive: true
regex: '.*luke.*'
group_id: '+all_the_lukes:hsdomain'
...
```
This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API.
2017-11-16 16:44:55 +00:00
ba05f28ae7
Merge pull request #2684 from matrix-org/rav/unlock_upsert
...
Start work on avoiding table locks for upserts
2017-11-16 16:27:29 +00:00
77a1227870
Fix broken ref to IntegrityError
2017-11-16 16:03:38 +00:00
7ab2b69e18
Avoid locking `pushers` table on upsert
...
Now that _simple_upsert will retry on IntegrityError, we don't need to lock the
table.
2017-11-16 15:32:01 +00:00
10aaa1bc15
_simple_upsert: retry on IntegrityError
...
wrap the call to _simple_upsert_txn in a loop so that we retry on an
integrityerror: this means we can avoid locking the table provided there is an
unique index.
2017-11-16 15:30:15 +00:00
cdc9e50a5d
Cleanup in _simple_upsert_txn
...
Bail out early to reduce indentation
2017-11-16 15:29:10 +00:00
56e2a4333e
Fix auth handler #2678
2017-11-15 22:49:43 +01:00
f959c01600
Merge pull request #2661 from matrix-org/rav/statereadstore
...
Pull out bits of StateStore to a mixin
2017-11-15 17:23:01 +00:00
117a8c0d35
Merge pull request #2677 from matrix-org/rav/spec_r0.3.0
...
Declare support for r0.3.0
2017-11-15 17:10:45 +00:00
30d2730ee2
Declare support for r0.3.0
2017-11-15 16:24:22 +00:00
aa812feb41
Merge branch 'master' of github.com:matrix-org/synapse into develop
2017-11-15 11:35:34 +00:00
552f123bea
Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse
2017-11-15 11:32:24 +00:00
5d0cbf763f
Bump changelog
2017-11-15 11:29:32 +00:00
1b83c09c03
Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs
...
Remove preserve_context_over_{fn, deferred}
2017-11-15 11:13:53 +00:00
7190a550dc
Merge pull request #2650 from matrix-org/dbkr/push_include_content_option
...
Rename redact_content option to include_content
2017-11-15 10:47:38 +00:00
b2cd6accf5
Remove __PreservingContextDeferred too
2017-11-14 23:00:10 +00:00
053ecae4db
Mention SyTest in the README, after Development
...
Signed-off-by: Andrew Conrad <aconrad103@gmail.com>
2017-11-14 15:11:35 -06:00
038c994724
Merge pull request #2648 from krombel/update_prometheus
...
update prometheus-config to new format
2017-11-14 19:14:32 +00:00
c161472575
Make clear that the config has changed since prometheus v2
...
This restores the config that is usable for prometheus pre v2.0.0
The new config only works for Prometheus v2+
2017-11-14 19:59:26 +01:00
008aa2fc6d
Merge pull request #2671 from matrix-org/rav/room_list_fixes
...
Reshuffle room list request code
2017-11-14 18:11:02 +00:00
6f30fd9235
Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups
...
Add new boolean columns to port script
2017-11-14 16:03:41 +00:00
9ecf621404
Less s's
2017-11-14 15:55:15 +00:00
22db751d1e
Add new boolean columns to port script
2017-11-14 15:48:50 +00:00
03feb7a34d
Bump version and changelog
2017-11-14 14:51:25 +00:00
35a4b63240
Pull out bits of StateStore to a mixin
...
... so that we don't need to secretly gut-wrench it for use in the slaved
stores. I haven't done the other stores yet, but we should. I'm tired of the
workers breaking every time we tweak the stores because I forgot to gut-wrench
the right method.
fixes https://github.com/matrix-org/synapse/issues/2655 .
2017-11-14 11:43:58 +00:00
4dd1bfa8c1
Revert "Revert "move _state_group_cache to statestore""
...
We're going to fix this properly on this branch, so that the _state_group_cache
can end up in StateGroupReadStore.
This reverts commit ab335edb02
2017-11-14 11:43:58 +00:00
6caa379ba1
Merge pull request #2658 from matrix-org/rav/store_heirarchy_init
...
Make __init__ consistent across Store hierarchy
2017-11-14 11:43:12 +00:00
7e6fa29cb5
Remove preserve_context_over_{fn, deferred}
...
Both of these functions ae known to leak logcontexts. Replace the remaining
calls to them and kill them off.
2017-11-14 11:22:42 +00:00
44a1bfd6a6
Reshuffle room list request code
...
I'm not entirely sure if this will actually help anything, but it simplifies
the code and might give further clues about why room list search requests are
blowing out the get_current_state_ids caches.
2017-11-14 10:29:58 +00:00
Richard van der Hoff