Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 3 | -28/+236 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720. | |||||
* | | | | | | | | | | | | | Merge tag 'v0.33.3rc2' into develop | Richard van der Hoff | 2018-08-21 | 46 | -46/+91 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723)) | |||||
| * | | | | | | | | | | | | changelog v0.33.3rc2 | Amber Brown | 2018-08-21 | 3 | -2/+10 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #3723 from matrix-org/rav/fix_logcontext_disaster | Amber Brown | 2018-08-21 | 3 | -3/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix exceptions when a connection is closed before we read the headers | |||||
| | * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Fix exceptions when a connection is closed before we read the headers | Richard van der Hoff | 2018-08-20 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bugs introduced in #3700, by making sure that we behave sanely when an incoming connection is closed before the headers are read. | |||||
| | * | | | | | | | | | | | | Robustness fix for logcontext filter | Richard van der Hoff | 2018-08-20 | 1 | -1/+7 | |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the logcontext filter not explode if it somehow ends up with a logcontext of None, since that infinite-loops the whole logging system. | |||||
| * | | | | | | | | | | | | changelog v0.33.3rc1 | Amber Brown | 2018-08-21 | 43 | -42/+64 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | version | Amber Brown | 2018-08-21 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys | Erik Johnston | 2018-08-21 | 3 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys | |||||
| * | | | | | | | | | | | | Log more detail when we fail to authenticate request | Erik Johnston | 2018-08-21 | 1 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys | Erik Johnston | 2018-08-21 | 2 | -4/+8 | |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not being able to resolve or connect to remote servers is an expected error, so we shouldn't log at ERROR with stacktraces. | |||||
* | | | | | | | | | | | | Merge pull request #3722 from matrix-org/erikj/bg_process_iteration | Erik Johnston | 2018-08-21 | 3 | -8/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | LaterGauge needs to call thread safe functions | |||||
| * | | | | | | | | | | | Fix typo | Erik Johnston | 2018-08-21 | 1 | -4/+4 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | isort | Erik Johnston | 2018-08-21 | 1 | -1/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make the in flight requests metrics thread safe | Erik Johnston | 2018-08-20 | 1 | -3/+10 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make the in flight background process metrics thread safe | Erik Johnston | 2018-08-20 | 1 | -5/+20 | |
|/ / / / / / / / / / / | ||||||
* | | / / / / / / / / | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 12 | -40/+91 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3719 from matrix-org/erikj/use_cache_fact | Erik Johnston | 2018-08-20 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use get_cache_factor_for function for `state_cache` | |||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-20 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use get_cache_factor_for function for `state_cache` | Erik Johnston | 2018-08-20 | 1 | -2/+2 | |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the cache factor for `state_cache` to be individually specified in the enviroment | |||||
* | | | | | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging | Erik Johnston | 2018-08-20 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix logging bug in EDU handling over replication | |||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-17 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix logging bug in EDU handling over replication | Erik Johnston | 2018-08-17 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands | Richard van der Hoff | 2018-08-17 | 9 | -20/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Logcontexts for replication command handlers | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Logcontexts for replication command handlers | Richard van der Hoff | 2018-08-17 | 8 | -20/+53 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky. | |||||
* | | | | | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 6 | -21/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix logcontexts for running pushers | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 5 | -21/+28 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts. | |||||
* | | | | | | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 17 | -67/+303 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 2 | -54/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 9 | -64/+63 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use a producer to stream back responses | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use a producer to stream back responses | Richard van der Hoff | 2018-08-15 | 1 | -4/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with dumping all of the json response into the Request object at once is that doing so starts the timeout for the next request to be received: so if it takes longer than 60s to stream back the response to the client, the client never gets it. The correct solution is to use a Producer; then the timeout is only started once all of the content is sent over the TCP connection. | |||||
* | | | | | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producers | Richard van der Hoff | 2018-08-17 | 3 | -92/+180 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor request logging code | |||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Refactor request logging code | Richard van der Hoff | 2018-08-15 | 2 | -92/+179 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves a bunch of the logic for deciding when to log the receipt and completion of HTTP requests into SynapseRequest, rather than in the request handling wrappers. Advantages of this are: * we get logs for *all* requests (including OPTIONS and HEADs), rather than just those that end up hitting handlers we've remembered to decorate correctly. * when a request handler wires up a Producer (as the media stuff does currently, and as other things will do soon), we log at the point that all of the traffic has been sent to the client. | |||||
| | | | | | | | | | | * | | Update notice format | Erik Johnston | 2018-08-22 | 3 | -8/+24 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | rename error code | Neil Johnson | 2018-08-18 | 4 | -8/+8 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 2 | -1/+9 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | clean up, no functional changes | Neil Johnson | 2018-08-17 | 3 | -56/+64 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 9 | -24/+75 | |
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | |||||
* | | | | | | | | | | | | | Merge pull request #3707 from matrix-org/neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 9 | -24/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | add new error type ResourceLimit | |||||
| * | | | | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse ↵ | Neil Johnson | 2018-08-17 | 12 | -4/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neilj/limit_exceeded_error | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 11 | -4/+35 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | server limits config docs | Neil Johnson | 2018-08-17 | 1 | -0/+26 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 8 | -24/+47 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 11 | -4/+34 | |
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | |||||
* | | | | | | | | | | | | | Merge pull request #3708 from ↵ | Neil Johnson | 2018-08-17 | 7 | -3/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation | |||||
| * | | | | | | | | | | | | | remove errant yield | Neil Johnson | 2018-08-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | For resource limit blocked users, prevent writing into rooms | Neil Johnson | 2018-08-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 4 | -2/+19 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3712 from matrix-org/travis/register-admin-docs | Amber Brown | 2018-08-17 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Update the admin register documentation to return a real user ID | |||||
| * | | | | | | | | | | | | Create 3712.misc | Travis Ralston | 2018-08-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Update the admin register documentation to return a real user ID | Travis Ralston | 2018-08-17 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Presumably this is the intention anyways. I've also updated the domain part to be something more along the lines of what people might expect. | |||||
* | | | | | | | | | | | | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker | Erik Johnston | 2018-08-16 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Fix inbound federation on reader worker | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix inbound federation on reader worker | Erik Johnston | 2018-08-16 | 1 | -0/+2 | |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data. | |||||
| | | | | | | | | * | | flake8 | Neil Johnson | 2018-08-16 | 1 | -3/+2 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | * | | refactor for readability, and reuse caching for setting tags | Neil Johnson | 2018-08-16 | 3 | -68/+115 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | * | | add room tagging | Neil Johnson | 2018-08-16 | 1 | -9/+5 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-16 | 6 | -3/+98 | |
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | |||||
* | | | | | | | | | | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 3 | -1/+51 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 3 | -2/+47 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | * | | check for room state before deciding on action | Neil Johnson | 2018-08-16 | 3 | -87/+58 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-16 | 7 | -28/+169 | |
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | |||||
* | | | | | | | | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 6 | -18/+159 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs | Richard van der Hoff | 2018-08-15 | 1 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Changelog should link to PRs | |||||
| * | | | | | | | | | | | Changelog should link to PRs | Richard van der Hoff | 2018-08-13 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changelog makes much more sense if it consistently links to PRs, rather than mostly PRs with the occasional issue #. | |||||
| | | | | | | | | | * | | WIP impl commiting to get feedback | Neil Johnson | 2018-08-16 | 1 | -6/+74 | |
| | | | | | | | | | | | | ||||||
| | | | | | | | | | * | | fix case where empty string state check is evaulated as False | Neil Johnson | 2018-08-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | ||||||
| | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 10 | -23/+231 | |
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | |||||
* | | | | | | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 4 | -4/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Mau off by one errors | |||||
| * | | | | | | | | | | | | Fix mau blocking calulation bug on login | Neil Johnson | 2018-08-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 31 | -186/+615 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 5 | -4/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | |||||
| * | | | | | | | | | | | | | | fix off by 1 errors | Neil Johnson | 2018-08-14 | 2 | -3/+14 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 2 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | |||||
| * | | | | | | | | | | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 3 | -7/+50 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -10/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 8 | -22/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 7 | -20/+111 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | |||||
* | | | | | | | | | | | | | | | | | Remove incorrectly re-added changelog files | Richard van der Hoff | 2018-08-15 | 2 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were removed for the 0.33.2 release, but were incorrectly re-added in | |||||
* | | | | | | | | | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 8 | -19/+174 | |
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 163 | -2853/+2949 | |
| | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | |||||
* | | | | | | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 16 | -138/+512 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | Move more federation APIs to workers | |||||
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 217 | -2760/+2605 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | |||||
| * | | | | | | | | | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 2 | -48/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function. | |||||
| * | | | | | | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStore | Erik Johnston | 2018-08-15 | 6 | -11/+11 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Update docs/workers.rst | Erik Johnston | 2018-08-09 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 2 | -2/+49 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Fixup doc comments | Erik Johnston | 2018-08-09 | 2 | -0/+28 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 67 | -408/+1156 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | |||||
| * | | | | | | | | | | | | | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Move necessary storage functions to worker classes | Erik Johnston | 2018-08-06 | 3 | -98/+100 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Import all functions from TransactionStore | Erik Johnston | 2018-08-06 | 1 | -11/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 4 | -13/+62 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 4 | -10/+290 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 9 | -30/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | support admin_email config and pass through into blocking errors, | |||||
| * | | | | | | | | | | | | | | | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵ | Neil Johnson | 2018-08-15 | 4 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email | |||||
| | * | | | | | | | | | | | | | | | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | update resource limit error codes | Neil Johnson | 2018-08-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 2 | -4/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 2 | -2/+2 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 5 | -11/+11 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 18 | -76/+373 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 | |
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | remove comments | |||||
| * | | | | | | | | | | | | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 7 | -22/+45 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | |||||
* | | | | | | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | combine mau metrics into one group | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 8 | -22/+115 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name | |||||
| * | | | | | | | | | | | | | Rename MAU prometheus metric | Neil Johnson | 2018-08-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 6 | -20/+79 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | |||||
| * | | | | | | | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 6 | -20/+77 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | |||||
* | | | | | | | | | | | | | Merge pull request #3692 from ↵ | Neil Johnson | 2018-08-14 | 4 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neil/fix_postgres_test_initialise_reserved_users Neil/fix postgres test initialise reserved users | |||||
| * | | | | | | | | | | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix missing yield in ↵ | Neil Johnson | 2018-08-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse.storage.monthly_active_users.initialise_reserved_users | |||||
| * | | | | | | | | | | | | | adding missing yield | Neil Johnson | 2018-08-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 7 | -20/+112 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Block ability to read via sync if mau limit exceeded | |||||
| * | | | | | | | | | | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 4 | -0/+53 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres | Amber Brown | 2018-08-14 | 2 | -16/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Neilj/fix reap users in postgres | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into ↵ | Amber Brown | 2018-08-14 | 56 | -292/+404 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres | |||||
* | | | | | | | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 3 | -37/+174 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base | Jan Christian Grünhage | 2018-08-14 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | update docker base-image to alpine 3.8 | |||||
| * | | | | | | | | | | | | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 2 | -1/+2 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Name changelog after PR, not bug | Richard van der Hoff | 2018-08-13 | 1 | -0/+0 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 3 | -196/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | |||||
| * | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 3 | -196/+2 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932. | |||||
* | | | | | | | | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 7 | -45/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | |||||
* | | | | | | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 7 | -22/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | |||||
* | | | | | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 49 | -59/+227 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests | Amber Brown | 2018-08-11 | 76 | -2280/+1631 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Blackify the tests | |||||
| * | | | | | | | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | changelog | Amber Brown | 2018-08-10 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 2 | -43/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix linearizer cancellation on twisted < 18.7 | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that cancellation of inlineDeferreds didn't really work properly until Twisted 18.7. This commit refactors Linearizer.queue to avoid inlineCallbacks. | |||||
* | | | | | | | | | | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 | |
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because logging *before* reloading means the log message gets lost in the old MemoryLogger | |||||
* | | | | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 33 | -34/+35 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 15 | -16/+113 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | send SNI for federation requests | |||||
| * | | | | | | | | | more generic conversion of str/bytes to unicode | Jeroen | 2018-08-09 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | include private functions from twisted | Jeroen | 2018-08-09 | 1 | -2/+35 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | updated docstring for ServerContextFactory | Jeroen | 2018-08-08 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix isort | Jeroen | 2018-07-29 | 1 | -2/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix accidental removal of hs | Jeroen | 2018-07-27 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 156 | -5187/+7015 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 347 | -1985/+2111 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 88 | -205/+1673 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | |||||
| * | | | | | | | | | | | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 15 | -13/+71 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | wip cut at sending resource server notices | Neil Johnson | 2018-08-15 | 2 | -44/+55 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | add new event types | Neil Johnson | 2018-08-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | backout ability to pass in event type to server notices | Neil Johnson | 2018-08-14 | 3 | -4/+5 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | support server notice state events for resource limits | Neil Johnson | 2018-08-14 | 4 | -8/+22 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | fix typo | Neil Johnson | 2018-08-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | server notices for resource limit blocking | Neil Johnson | 2018-08-10 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | implementation of server notices to alert on hitting resource limits | Neil Johnson | 2018-08-10 | 3 | -45/+190 | |
| | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | wip at implementing MSC 7075 | Neil Johnson | 2018-08-09 | 1 | -0/+84 | |
| | | | | | | |_|_|_|/ / | | | | | | |/| | | | | | ||||||
| | | | | | * | | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 4 | -18/+19 | |
| | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 3 | -12/+48 | |
| | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | Where server is disabled, block ability for locked out users to read new ↵ | Neil Johnson | 2018-08-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages | |||||
| | | | | | * | | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 2 | -13/+18 | |
| | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 6 | -1/+22 | |
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | |||||
* | | | | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 6 | -1/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Flag to disable HS without disabling federation | |||||
| * | | | | | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 14 | -22/+245 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 6 | -7/+115 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Ability to disable client/server Synapse via conf toggle | Neil Johnson | 2018-08-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 16 | -157/+226 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 1 | -4/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-06 | 2 | -8/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs | |||||
| * | | | | | | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 5 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 98 | -405/+819 | |
| | | | | | | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 61 | -56/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2 | Amber Brown | 2018-08-09 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fix the changelog & template | Amber Brown | 2018-08-09 | 2 | -50/+50 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fix changelog | Amber Brown | 2018-08-07 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | changelog | Amber Brown | 2018-08-07 | 59 | -54/+64 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | version | Amber Brown | 2018-08-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 6 | -274/+396 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | |||||
| * | | | | | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 67 | -647/+1073 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | |||||
| * | | | | | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-31 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will hopefully reduce the boiler plate required to implement new internal HTTP requests. | |||||
* | | | | | | | | | | | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 14 | -52/+71 | |
| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 4 | -1/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | |||||
| * | | | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 14 | -22/+244 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | Support for room versioning | |||||
| * | | | | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | sanity check response from make_join | Richard van der Hoff | 2018-08-03 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 3 | -4/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject make_join requests from servers which do not support the room version. Also include the room version in the response. | |||||
| * | | | | | | | | | | | | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 7 | -5/+83 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | |||||
| * | | | | | | | | | | | | | | | | | Docstrings for BaseFederationServlet | Richard van der Hoff | 2018-08-03 | 1 | -0/+47 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save me reverse-engineering this stuff again. | |||||
| | | | | | | | | | | | | * | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 2 | -5/+53 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #3662 from matrix-org/neilj/reserved_users | Neil Johnson | 2018-08-08 | 6 | -7/+115 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | Reserved users for MAU limits | |||||
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-08 | 16 | -156/+225 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/reserved_users | |||||
* | | | | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 18 | -163/+414 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | API for monthly_active_users table | |||||
| * | | | | | | | | | | | | | | | typos | Neil Johnson | 2018-08-08 | 2 | -3/+3 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #3658 from ↵ | Richard van der Hoff | 2018-08-07 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/fix_event_persisted_position_metrics Fix occasional glitches in the synapse_event_persisted_position metric | |||||
| * | | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metric | Richard van der Hoff | 2018-08-07 | 1 | -3/+8 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every so often this metric glitched to a negative number. I'm assuming it was due to backfilled events. | |||||
* / | | | | | | | | | | | | | | fix event lag graph | Richard van der Hoff | 2018-08-07 | 1 | -8/+16 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 2 | -31/+59 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #3644 from ↵ | Michael Kaye | 2018-08-03 | 9 | -112/+139 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/refactor_docker_locations_v2 Refactor Dockerfile location | |||||
| * | | | | | | | | | | | | | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to contrib/docker | |||||
| * | | | | | | | | | | | | | Update README.md | Michael Kaye | 2018-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to docker/README.md | |||||
| * | | | | | | | | | | | | | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to contrib/docker | |||||
| * | | | | | | | | | | | | | Update README.rst | Michael Kaye | 2018-08-03 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrap at 80ish | |||||
| * | | | | | | | | | | | | | Add news entry | Michael Kaye | 2018-08-02 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Address SPAG issues | Michael Kaye | 2018-08-02 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Do not include docker files in python build | Michael Kaye | 2018-08-02 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Refactor docker locations and README. | Michael Kaye | 2018-08-02 | 7 | -110/+126 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses #3224 | |||||
| | | * | | | | | | | | | | | Ability to whitelist specific threepids against monthly active user limiting | Neil Johnson | 2018-08-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | |