79eba878a7
Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all
...
Try to avoid having multiple PreviewUrlResource instances
2017-11-22 16:46:09 +00:00
68ca864141
Add config option to disable media_repo on main synapse
...
... to stop us doing the cache cleanup jobs on the master.
2017-11-22 16:20:27 +00:00
e1fd4751de
Build MediaRepositoryResource as a homeserver dependency
...
This avoids the scenario where we have four different PreviewUrlResources
configured on a single app, each of which have their own caches and cache
clearing jobs.
2017-11-22 16:19:49 +00:00
148c113fbe
Merge pull request #2700 from matrix-org/rav/worker_docs
...
* Improve documentation of workers
Fixes https://github.com/matrix-org/synapse/issues/2554
2017-11-21 18:28:40 +00:00
a0c6688976
Improve documentation of workers
...
Fixes https://github.com/matrix-org/synapse/issues/2554
2017-11-21 18:28:13 +00:00
d5a7c56ef9
Merge pull request #2698 from matrix-org/rav/remove_dead_dependencies
...
Clean up dependency list
2017-11-21 17:38:42 +00:00
0b4aa2dc21
Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsert
...
Avoid locking account_data tables for upserts
2017-11-21 13:39:14 +00:00
3ab2cfec47
sanity checks
2017-11-21 12:10:20 +00:00
7298ed7c51
Clean up dependency list
...
remove those that aren't used at all, and replace the ones that don't have
builders with simple getters rather than dynamically-generated methods.
2017-11-21 11:15:41 +00:00
7098b65cb8
Fix error on sqlite 3.7
...
Create the url_cache index on local_media_repository as a background update, so
that we can detect whether we are on sqlite or not and create a partial or
complete index accordingly.
To avoid running the cleanup job before we have built the index, add a bailout
which will defer the cleanup if the bg updates are still running.
Fixes https://github.com/matrix-org/synapse/issues/2572 .
2017-11-21 11:14:17 +00:00
2145ee1976
don't double-invite in sync_room_to_group.pl
2017-11-19 00:48:47 +00:00
59a7275258
Merge pull request #2688 from matrix-org/rav/unlock_more_upsert
...
Avoid locking for upsert on pushers tables
2017-11-17 13:09:31 +00:00
d8a05418f9
Merge branch 'master' into develop
2017-11-17 12:13:14 +00:00
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
Richard van der Hoff